summaryrefslogtreecommitdiffstats
path: root/gl/gettext.h
diff options
context:
space:
mode:
Diffstat (limited to 'gl/gettext.h')
-rw-r--r--gl/gettext.h22
1 files changed, 15 insertions, 7 deletions
diff --git a/gl/gettext.h b/gl/gettext.h
index 881ae330..d0215715 100644
--- a/gl/gettext.h
+++ b/gl/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-2010 Free Software 2 Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2013 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
@@ -54,7 +53,7 @@
54 it now, to make later inclusions of <libintl.h> a NOP. */ 53 it now, to make later inclusions of <libintl.h> a NOP. */
55#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3) 54#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
56# include <cstdlib> 55# include <cstdlib>
57# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H 56# if (__GLIBC__ >= 2 && !defined __UCLIBC__) || _GLIBCXX_HAVE_LIBINTL_H
58# include <libintl.h> 57# include <libintl.h>
59# endif 58# endif
60#endif 59#endif
@@ -93,6 +92,12 @@
93 92
94#endif 93#endif
95 94
95/* Prefer gnulib's setlocale override over libintl's setlocale override. */
96#ifdef GNULIB_defined_setlocale
97# undef setlocale
98# define setlocale rpl_setlocale
99#endif
100
96/* A pseudo function call that serves as a marker for the automated 101/* A pseudo function call that serves as a marker for the automated
97 extraction of messages, but does not call gettext(). The run-time 102 extraction of messages, but does not call gettext(). The run-time
98 translation is done at a different place in the code. 103 translation is done at a different place in the code.
@@ -178,9 +183,12 @@ npgettext_aux (const char *domain,
178 183
179#include <string.h> 184#include <string.h>
180 185
181#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \ 186#if (((__GNUC__ >= 3 || __GNUG__ >= 2) && !defined __STRICT_ANSI__) \
182 (((__GNUC__ >= 3 || __GNUG__ >= 2) && !__STRICT_ANSI__) \ 187 /* || __STDC_VERSION__ >= 199901L */ )
183 /* || __STDC_VERSION__ >= 199901L */ ) 188# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1
189#else
190# define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0
191#endif
184 192
185#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 193#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
186#include <stdlib.h> 194#include <stdlib.h>