Prefer gnulib's setlocale override over libintl's override.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 21af8fefe237275fb0412e197d4c7fd1942a0bea..b8299fb0baf42466e157e40c845ccd19b48ef12f 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-12  Bruno Haible  <bruno@clisp.org>
+
+       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  <bruno@clisp.org>
 
        Update after gnulib changed.

diff --git a/gnulib-local/lib/gettext.h b/gnulib-local/lib/gettext.h
index da3b017efb4b5e99f728a5b179e2b82f253a212e..c2671dda582dfcadbbb7507f99a6d5446b2376ca 100644 (file)
--- a/gnulib-local/lib/gettext.h
+++ b/gnulib-local/lib/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 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.