diff options
| author | Paul Eggert | 2012-05-26 16:14:36 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-05-26 16:14:36 -0700 |
| commit | caf8a9b2b301aba06735d403317b75b41df59bfe (patch) | |
| tree | bfafb3cc0cf8a2f2394b4ed721e7c3d4891b78ab /lib/gettext.h | |
| parent | fe453991eafc32a890297a2003ac532b9f579f92 (diff) | |
| download | emacs-caf8a9b2b301aba06735d403317b75b41df59bfe.tar.gz emacs-caf8a9b2b301aba06735d403317b75b41df59bfe.zip | |
Merge from gnulib.
Fixes: debbugs:11527
Diffstat (limited to 'lib/gettext.h')
| -rw-r--r-- | lib/gettext.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/gettext.h b/lib/gettext.h index 458e3322177..75875cdb0fb 100644 --- a/lib/gettext.h +++ b/lib/gettext.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Convenience header for conditional use of GNU <libintl.h>. | 1 | /* Convenience header for conditional use of GNU <libintl.h>. |
| 2 | Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2011 Free Software | 2 | Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2012 Free Software |
| 3 | Foundation, Inc. | 3 | Foundation, Inc. |
| 4 | 4 | ||
| 5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
| @@ -13,8 +13,7 @@ | |||
| 13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
| 14 | 14 | ||
| 15 | You should have received a copy of the GNU General Public License along | 15 | You should have received a copy of the GNU General Public License along |
| 16 | with this program; if not, write to the Free Software Foundation, | 16 | with this program; if not, see <http://www.gnu.org/licenses/>. */ |
| 17 | Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ | ||
| 18 | 17 | ||
| 19 | #ifndef _LIBGETTEXT_H | 18 | #ifndef _LIBGETTEXT_H |
| 20 | #define _LIBGETTEXT_H 1 | 19 | #define _LIBGETTEXT_H 1 |
| @@ -185,7 +184,7 @@ npgettext_aux (const char *domain, | |||
| 185 | #include <string.h> | 184 | #include <string.h> |
| 186 | 185 | ||
| 187 | #define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \ | 186 | #define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \ |
| 188 | (((__GNUC__ >= 3 || __GNUG__ >= 2) && !__STRICT_ANSI__) \ | 187 | (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \ |
| 189 | /* || __STDC_VERSION__ >= 199901L */ ) | 188 | /* || __STDC_VERSION__ >= 199901L */ ) |
| 190 | 189 | ||
| 191 | #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS | 190 | #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS |