From patchwork Thu Jul 31 21:05:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 2265 Received: (qmail 18637 invoked by alias); 31 Jul 2014 21:05:39 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 18626 invoked by uid 89); 31 Jul 2014 21:05:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.8 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Date: Fri, 1 Aug 2014 02:35:32 +0530 From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Subject: [PATCH] Fix -Wundef warnings in regex_internal.h Message-ID: <20140731210532.GP16739@spoyarek.pnq.redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.22.1-rc1 (2013-10-16) Hi, This patch defines macros that gnulib looks for and also syncs up the macro check with gnulib. No change in generated code on i686. Siddhesh * include/libc-symbols.h (HAVE_LIBINTL_H): Define macro. (HAVE_WCTYPE_H): Likewise. (HAVE_ISWCTYPE): Likewise. (ENABLE_NLS): Likewise. * posix/regex_internal.h [(defined MB_CUR_MAX && HAVE_WCTYPE_H && HAVE_ISWCTYPE) || _LIBC]: Sync up with gnulib. diff --git a/include/libc-symbols.h b/include/libc-symbols.h index d833eb7..48edadc 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -62,6 +62,10 @@ #define STDC_HEADERS 1 #define HAVE_MBSTATE_T 1 #define HAVE_MBSRTOWCS 1 +#define HAVE_LIBINTL_H 1 +#define HAVE_WCTYPE_H 1 +#define HAVE_ISWCTYPE 1 +#define ENABLE_NLS 1 /* The symbols in all the user (non-_) macros are C symbols. */ diff --git a/posix/regex_internal.h b/posix/regex_internal.h index 75c390f..4bbf6a8 100644 --- a/posix/regex_internal.h +++ b/posix/regex_internal.h @@ -90,7 +90,7 @@ # define SIZE_MAX ((size_t) -1) #endif -#if (defined MB_CUR_MAX && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_WCRTOMB && HAVE_MBRTOWC && HAVE_WCSCOLL) || _LIBC +#if (defined MB_CUR_MAX && HAVE_WCTYPE_H && HAVE_ISWCTYPE) || _LIBC # define RE_ENABLE_I18N #endif