Shut up warnings in libintl.h

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 84a66a54e6c29e6d36de46a49f67af8301861b5e..f4dfb454a650b0ca55e6ec8980e0fd01f7f10e0f 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -372,10 +372,10 @@ ifeq ($(BUILD),i586-pc-beos)
 endif
 ifneq ($(HOST),$(BUILD))
 # We'll use the installed gettext and only need to cross-compile libintl, also build autopoint and gettextsize tools need for VLC bootstrap
-       ( cd $< && make -C gettext-runtime/intl && make -C gettext-runtime/intl install && make -C gettext-tools/misc install )
+       ( cd $< && make -C gettext-runtime/intl && patch -p1 < ../Patches/libintl.patch && make -C gettext-runtime/intl install && make -C gettext-tools/misc install )
 else
 # Build and install the whole gettext
-       ( cd $< && make && make install )
+       ( cd $< && make && patch -p1 < ../Patches/libintl.patch && make install )
 endif
 # Work around another non-sense of autoconf.
 ifdef HAVE_WIN32

diff --git a/extras/contrib/src/Patches/libintl.patch b/extras/contrib/src/Patches/libintl.patch
new file mode 100644 (file)
index 0000000..c655975
--- /dev/null
+++ b/extras/contrib/src/Patches/libintl.patch
@@ -0,0 +1,21 @@
+--- gettext/gettext-runtime/intl/libintl.h     2006-12-03 17:42:40.265625000 -0500
++++ gettext/gettext-runtime/intl/libintl.h     2006-12-04 19:27:03.125000000 -0500
+@@ -88,7 +88,7 @@
+    If he doesn't, we choose the method.  A third possible method is
+    _INTL_REDIRECT_ASM, supported only by GCC.  */
+ #if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
+-# if __GNUC__ >= 2 && !(__APPLE_CC__ > 1) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
++# if __GNUC__ >= 2 && !((defined __APPLE_CC__) && (__APPLE_CC__ > 1)) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
+ #  define _INTL_REDIRECT_ASM
+ # else
+ #  ifdef __cplusplus
+@@ -110,7 +110,7 @@
+ /* _INTL_MAY_RETURN_STRING_ARG(n) declares that the given function may return
+    its n-th argument literally.  This enables GCC to warn for example about
+    printf (gettext ("foo %y")).  */
+-#if __GNUC__ >= 3 && !(__APPLE_CC__ > 1 && defined __cplusplus)
++#if __GNUC__ >= 3 && !((defined __APPLE_CC__) && (__APPLE_CC__ > 1) && defined __cplusplus)
+ # define _INTL_MAY_RETURN_STRING_ARG(n) __attribute__ ((__format_arg__ (n)))
+ #else
+ # define _INTL_MAY_RETURN_STRING_ARG(n)
+