*** empty log message ***

diff --git a/lib/regex.c b/lib/regex.c
index 40804405d94e7c0a805bbd63113a50a4a8d40548..74eaa2dcc9bb44280068be0540ad9ab8f1cd19f5 100644 (file)
--- a/lib/regex.c
+++ b/lib/regex.c
@@ -52,8 +52,8 @@
 /* For platform which support the ISO C amendement 1 functionality we
    support user defined character classes.  */
 #if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H)
-# include <wctype.h>
 # include <wchar.h>
+# include <wctype.h>
 #endif
 
 /* This is for other GNU distributions with internationalized messages.  */
@@ -194,6 +194,7 @@ init_syntax_once ()
    Defining isascii to 1 should let any compiler worth its salt
    eliminate the && through constant folding."  */
 
+#undef ISASCII
 #if defined STDC_HEADERS || (!defined isascii && !defined HAVE_ISASCII)
 # define ISASCII(c) 1
 #else
@@ -211,6 +212,7 @@ init_syntax_once ()
 # define ISGRAPH(c) (ISASCII (c) && isprint (c) && !isspace (c))
 #endif
 
+#undef ISPRINT
 #define ISPRINT(c) (ISASCII (c) && isprint (c))
 #define ISDIGIT(c) (ISASCII (c) && isdigit (c))
 #define ISALNUM(c) (ISASCII (c) && isalnum (c))