Update and enable NNTP patch

[software/mutt-debian.git] / regex.c

diff --git a/regex.c b/regex.c
index af7a20a0a3f18906b11530e7cc8ecba78ece827d..e766f1c2dfa4ce973da65f43653f57960e0a4082 100644 (file)
--- a/regex.c
+++ b/regex.c
@@ -56,6 +56,13 @@
 
 #undef DEBUG
 
 
 #undef DEBUG
 

+/* On OS X 10.5.x, wide char functions are inlined by default breaking
+ * --without-wc-funcs compilation
+ */
+#ifdef __APPLE_CC__
+#define _DONT_USE_CTYPE_INLINE_
+#endif
+

 #if (defined(HAVE_ALLOCA_H) && !defined(_AIX))
 # include <alloca.h>
 #endif
 #if (defined(HAVE_ALLOCA_H) && !defined(_AIX))
 # include <alloca.h>
 #endif


@@ -73,10 +80,12 @@
 
 /* For platform which support the ISO C amendement 1 functionality we
    support user defined character classes.  */
 
 /* 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>
+#ifdef HAVE_WCHAR_H

 # include <wchar.h>
 #endif
 # include <wchar.h>
 #endif

+#if defined(HAVE_WCTYPE_H) && defined(HAVE_WC_FUNCS)
+# include <wctype.h>
+#endif

 
 /* This is for other GNU distributions with internationalized messages.  */
 #if HAVE_LIBINTL_H || defined (_LIBC)
 
 /* This is for other GNU distributions with internationalized messages.  */
 #if HAVE_LIBINTL_H || defined (_LIBC)