Fix -Wundef warnings in regex_internal.h

diff --git a/ChangeLog b/ChangeLog
index e69f433..1f5907e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2014-08-01  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
+       * 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.
+
        * posix/regex_internal.c: Check if DEBUG is defined and is
        set.
 

diff --git a/include/libc-symbols.h b/include/libc-symbols.h
index d833eb7..48edadc 100644 (file)
--- 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 (file)
--- 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