summaryrefslogtreecommitdiff
path: root/gettext
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2011-05-31 01:15:54 +0300
committerTor Lillqvist <tml@iki.fi>2011-05-31 01:17:17 +0300
commitd49fe1968a4b5a3c79fa71177bcdeeb702db264e (patch)
tree07eaf48fbefe8147cdab167d5a0dbfb30ff27dc3 /gettext
parent896eac5669806b0d8e74049572ae0959b6c4bc7a (diff)
Improve gettext build for iOS
Diffstat (limited to 'gettext')
-rw-r--r--gettext/gettext-0.18.1.1.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/gettext/gettext-0.18.1.1.patch b/gettext/gettext-0.18.1.1.patch
index 72970b663bec..016b65d8838b 100644
--- a/gettext/gettext-0.18.1.1.patch
+++ b/gettext/gettext-0.18.1.1.patch
@@ -2721,7 +2721,7 @@
+#endif
+
+#include <locale.h>
-+#if (defined __APPLE__ && defined __MACH__) && HAVE_NEWLOCALE
++#if (defined __APPLE__ && defined __MACH__)
+# include <xlocale.h>
+#endif
+
@@ -3016,7 +3016,7 @@
+ or gettext() but for which the format string could be the return value
+ of _() or gettext() need to add this #include. Oh well. */
+
-+#if !0
++#if !(defined __APPLE__ && defined __MACH__)
+
+#include <stdio.h>
+#include <stddef.h>
@@ -3138,7 +3138,7 @@
+#define setlocale libintl_setlocale
+extern LIBINTL_DLL_EXPORTED char *setlocale (int, const char *);
+
-+#if HAVE_NEWLOCALE
++#if (defined __APPLE__ && defined __MACH__)
+
+#undef newlocale
+#define newlocale libintl_newlocale
@@ -3194,7 +3194,7 @@
+#define _LIBINTL_H 1
+
+#include <locale.h>
-+#if (defined __APPLE__ && defined __MACH__) && 0
++#if (defined __APPLE__ && defined __MACH__)
+# include <xlocale.h>
+#endif
+
@@ -3485,7 +3485,7 @@
+ or gettext() but for which the format string could be the return value
+ of _() or gettext() need to add this #include. Oh well. */
+
-+#if !0
++#if !(defined __APPLE__ && defined __MACH__)
+
+#include <stdio.h>
+#include <stddef.h>
@@ -3607,7 +3607,7 @@
+#define setlocale libintl_setlocale
+extern char *setlocale (int, const char *);
+
-+#if 0
++#if (defined __APPLE__ && defined __MACH__)
+
+#undef newlocale
+#define newlocale libintl_newlocale