(WIDE_CHAR_SUPPORT): Do not use defined() in macro.

From Hallvard B Furuseth <h.b.furuseth@usit.uio.no>.

diff --git a/src/ChangeLog b/src/ChangeLog
index fcd316010fa7031477c0fb50355fe47d5b2b01d2..3b6120e1116b76df38d2bf4d62a6233eed3aeb4b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Gerd Moellmann  <gerd@gnu.org>
+
+       * regex.c (WIDE_CHAR_SUPPORT): Do not use defined() in macro.
+       From Hallvard B Furuseth <h.b.furuseth@usit.uio.no>.
+
 2001-10-08  Andrew Innes  <andrewi@gnu.org>
 
        * lisp.h [max]: Undef min and max before redefining them.

diff --git a/src/regex.c b/src/regex.c
index 9fe099c7125fbfdae837436764d2fdcfaee0f7eb..38fc80437fd8fae3b4474dc13934b9e41c43d6ae 100644 (file)
--- a/src/regex.c
+++ b/src/regex.c
@@ -49,8 +49,12 @@
 
 /* Whether to use ISO C Amendment 1 wide char functions.
    Those should not be used for Emacs since it uses its own.  */
+#if defined _LIBC
+#define WIDE_CHAR_SUPPORT 1
+#else
 #define WIDE_CHAR_SUPPORT \
-  (defined _LIBC || HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC && !emacs)
+       (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC && !emacs)
+#endif
 
 /* For platform which support the ISO C amendement 1 functionality we
    support user defined character classes.  */