michael@271: Index: gettext-runtime/intl/plural-exp.c
michael@271: --- gettext-runtime/intl/plural-exp.c.orig	2009-06-28 21:44:04.000000000 +0200
michael@271: +++ gettext-runtime/intl/plural-exp.c	2010-05-10 08:51:14.000000000 +0200
michael@271: @@ -27,7 +27,7 @@
michael@271:  
michael@271:  #include "plural-exp.h"
michael@271:  
michael@271: -#if (defined __GNUC__ && !(__APPLE_CC__ > 1) && !defined __cplusplus) \
michael@271: +#if (defined __GNUC__ && !(__APPLE_CC__+0 > 1) && !defined __cplusplus) \
michael@271:      || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
michael@271:  
michael@271:  /* These structs are the constant expression for the germanic plural
michael@271: Index: gettext-tools/gnulib-lib/execute.c
michael@271: --- gettext-tools/gnulib-lib/execute.c.orig	2010-02-16 22:32:17.000000000 +0100
michael@271: +++ gettext-tools/gnulib-lib/execute.c	2010-05-10 20:22:18.000000000 +0200
michael@271: @@ -200,6 +200,9 @@
michael@271:       subprocess to exit with return code 127.  It is implementation
michael@271:       dependent which error is reported which way.  We treat both cases as
michael@271:       equivalent.  */
michael@271: +#ifndef HAVE_ENVIRON_DECL
michael@271: +  extern char **environ;
michael@271: +#endif
michael@271:    sigset_t blocked_signals;
michael@271:    posix_spawn_file_actions_t actions;
michael@271:    bool actions_allocated;