diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-14 20:53:29 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-14 20:53:29 -0800 |
| commit | bb55f713d2e4ea089a861a257d7d000432642ce9 (patch) | |
| tree | 92cf79666025c70a6541e87cb47ab8299c5f92af /lib/gettext.h | |
| parent | 8017fd6b81ed07c1ff3adf7494c867f9a2b034a9 (diff) | |
| download | emacs-bb55f713d2e4ea089a861a257d7d000432642ce9.tar.gz | |
Merge from gnulib.
Diffstat (limited to 'lib/gettext.h')
| -rw-r--r-- | lib/gettext.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/gettext.h b/lib/gettext.h index eb74aecb9a8..458e3322177 100644 --- a/lib/gettext.h +++ b/lib/gettext.h @@ -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. |