Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Gautam Chitnis
web-ui-redesign
Commits
82233a29
Commit
82233a29
authored
Mar 04, 2007
by
Christophe Mutricy
Browse files
Shut up warnings in libintl.h
parent
8c5755cd
Changes
2
Hide whitespace changes
Inline
Side-by-side
extras/contrib/src/Makefile
View file @
82233a29
...
...
@@ -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
...
...
extras/contrib/src/Patches/libintl.patch
0 → 100644
View file @
82233a29
--- 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)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment