Unbreak compilation with --without-wc-funcs on OS X 10.5.*, see #3149.

diff --git a/ChangeLog b/ChangeLog
index d80c3255bd594790e009988cd44343392b3ca9cf..fca1162f6da6ecc4301905fb78d3036fed869f89 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-03-09 11:49 +0100  Rocco Rutte  <pdmef@gmx.net>  (bcf1e9692caf)
+
+       * init.h: Fix 11cd72da743a
+
+2009-03-09 11:30 +0100  Rocco Rutte  <pdmef@gmx.net>  (11cd72da743a)
+
+       * ChangeLog, init.h: Sort SSL-related variables, see #3191.
+
 2009-03-09 11:11 +0100  Rocco Rutte  <pdmef@gmx.net>  (a96d427b203b)
 
        * hash.c, hash.h, init.c, mh.c, thread.c: Restore $reverse_alias

diff --git a/mutt.h b/mutt.h
index 5ccb3a1f50a137a42726e7b8fb775d45737e6536..87b4178515ff5631866433d3672ffaadc1e1baa6 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -35,6 +35,12 @@
 #include <limits.h>
 #include <stdarg.h>
 #include <signal.h>
+/* 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
 #ifdef HAVE_WCHAR_H
 # include <wchar.h>
 #endif

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
 
+/* 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
@@ -73,10 +80,12 @@
 
 /* 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
+#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)