From 8c9d8b0597df569ccc4efebd67dd70497318606a Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 12 Feb 2011 17:15:00 +0100 Subject: [PATCH] Avoid clashing overrides for setlocale. --- gettext-runtime/intl/ChangeLog | 6 ++++++ gettext-runtime/intl/libgnuintl.in.h | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 7f4721093..fe3c4448b 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,9 @@ +2011-02-12 Bruno Haible + + Avoid clashing overrides for setlocale. + * libgnuintl.in.h (setlocale): Don't override if the gnulib override is + already enabled. + 2011-06-03 Bruno Haible * wprintf-parse.h: Apply same changes as to printf-parse.h. diff --git a/gettext-runtime/intl/libgnuintl.in.h b/gettext-runtime/intl/libgnuintl.in.h index 4176b44b7..8aea5c2e4 100644 --- a/gettext-runtime/intl/libgnuintl.in.h +++ b/gettext-runtime/intl/libgnuintl.in.h @@ -1,5 +1,5 @@ /* Message catalogs for internationalization. - Copyright (C) 1995-1997, 2000-2010 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 2000-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 @@ -431,9 +431,11 @@ extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list); /* Support for the locale chosen by the user. */ #if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ +#ifndef GNULIB_defined_setlocale /* don't override gnulib */ #undef setlocale #define setlocale libintl_setlocale extern char *setlocale (int, const char *); +#endif #if @HAVE_NEWLOCALE@ -- 2.47.2