diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-15 11:18:37 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-07-15 11:18:37 -0700 |
| commit | b6e9e0ffacf249934e92448e85e965e90aa3cf4b (patch) | |
| tree | 21abdf10950da2d63a8841b068b9e360b5e35cc9 /lib/gettext.h | |
| parent | ce811ad97550ff70e2bd71e1ada496b4715d9b08 (diff) | |
| download | emacs-b6e9e0ffacf249934e92448e85e965e90aa3cf4b.tar.gz | |
Merge from gnulib.
2012-07-15 pthread_sigmask: fix bug on FreeBSD 9 (Bug#11884)
2012-07-11 gettext: do not assume '#define ... defined ...' behavior
Diffstat (limited to 'lib/gettext.h')
| -rw-r--r-- | lib/gettext.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/gettext.h b/lib/gettext.h index 75875cdb0fb..65ca1e6762e 100644 --- a/lib/gettext.h +++ b/lib/gettext.h @@ -183,9 +183,12 @@ npgettext_aux (const char *domain, #include <string.h> -#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \ - (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \ - /* || __STDC_VERSION__ >= 199901L */ ) +#if (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \ + /* || __STDC_VERSION__ >= 199901L */ ) +# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1 +#else +# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0 +#endif #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS #include <stdlib.h> |