diff options
| author | Simon Josefsson <simon@josefsson.org> | 2011-02-20 16:25:16 +0100 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2011-02-20 16:26:21 +0100 |
| commit | aee017b8888c904c42a303586f05a193f778cedb (patch) | |
| tree | a44f8ee5f243968fdef3bc5f5719387360831479 /lib/gl/gettext.h | |
| parent | 8f177e5e8fc4ea89d3611be2a70832147dba5e82 (diff) | |
| download | gnutls-aee017b8888c904c42a303586f05a193f778cedb.tar.gz | |
Update gnulib files.
Diffstat (limited to 'lib/gl/gettext.h')
| -rw-r--r-- | lib/gl/gettext.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/gl/gettext.h b/lib/gl/gettext.h index d743a2ba98..202f1019ae 100644 --- a/lib/gl/gettext.h +++ b/lib/gl/gettext.h @@ -1,5 +1,5 @@ /* Convenience header for conditional use of GNU <libintl.h>. - Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2010 Free Software + Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2011 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -93,6 +93,12 @@ #endif +/* Prefer gnulib's setlocale override over libintl's setlocale override. */ +#ifdef GNULIB_defined_setlocale +# undef setlocale +# define setlocale rpl_setlocale +#endif + /* A pseudo function call that serves as a marker for the automated extraction of messages, but does not call gettext(). The run-time translation is done at a different place in the code. |