From 32d358066fff36190c06e1d49c93e3b20ac07c68 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 13 Feb 2011 03:58:04 +0100 Subject: [PATCH] Prefer gnulib's setlocale override over libintl's override. --- gnulib-local/ChangeLog | 6 ++++++ gnulib-local/lib/gettext.h | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog index 21af8fefe..b8299fb0b 100644 --- a/gnulib-local/ChangeLog +++ b/gnulib-local/ChangeLog @@ -1,3 +1,9 @@ +2011-02-12 Bruno Haible + + Prefer gnulib's setlocale override over libintl's override. + * lib/gettext.h (setlocale): Redefine to rpl_setlocale if + GNULIB_defined_setlocale is set. + 2011-02-12 Bruno Haible Update after gnulib changed. diff --git a/gnulib-local/lib/gettext.h b/gnulib-local/lib/gettext.h index da3b017ef..c2671dda5 100644 --- a/gnulib-local/lib/gettext.h +++ b/gnulib-local/lib/gettext.h @@ -1,5 +1,5 @@ /* Convenience header for conditional use of GNU . - Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2010 Free Software Foundation, Inc. + 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 it under the terms of the GNU Library General Public License as published @@ -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. -- 2.47.2