From a476ac4b45fe39b023bed55c852abad04d70c5df Mon Sep 17 00:00:00 2001
From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Fri, 1 Aug 2014 14:30:43 +0530
Subject: [PATCH] Fix -Wundef warnings in regex_internal.h

---
 ChangeLog              | 7 +++++++
 include/libc-symbols.h | 4 ++++
 posix/regex_internal.h | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e69f433669..1f5907ebbc 100644
--- 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 d833eb7420..48edadcfe0 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 75c390f8c8..4bbf6a8276 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