diff mbox

Fix -Wundef warnings in regex_internal.h

Message ID 20140731210532.GP16739@spoyarek.pnq.redhat.com
State Committed
Headers

Commit Message

Siddhesh Poyarekar July 31, 2014, 9:05 p.m. UTC 
  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.

Comments

Roland McGrath July 31, 2014, 9:08 p.m. UTC | #1 
OK, but you should follow up with gnulib to clean up all unnecessary _LIBC
tests and then re-synch our copies.
Siddhesh Poyarekar July 31, 2014, 9:11 p.m. UTC | #2 
On Thu, Jul 31, 2014 at 02:08:33PM -0700, Roland McGrath wrote:
> OK, but you should follow up with gnulib to clean up all unnecessary _LIBC
> tests and then re-synch our copies.

Ack, I'll do a more comprehensive synch when 2.21 opens.

Siddhesh
diff mbox

Patch

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