Avoid a link error when building statically on mingw.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index a8867314e00a2e988eca5c82bcf69445180703c7..8ec88484a8a37970cc73d7d9f2cc762bcf3ad823 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-20  Bruno Haible  <bruno@clisp.org>
+
+       Avoid a link error when building statically on mingw.
+       * gettextP.h (gl_locale_name_thread): Alias to _nl_locale_name_thread.
+       Reported by Rob <sisyphus1@optusnet.com.au>.
+
 2010-05-16  Bruno Haible  <bruno@clisp.org>
 
        * libgnuintl.h.in (printf): Add comment.

diff --git a/gettext-runtime/intl/gettextP.h b/gettext-runtime/intl/gettextP.h
index 33e68779b67289380e4c4a84d282d00cb5a7060a..5168b4c804d49b485e78420ac95afa732e282794 100644 (file)
--- a/gettext-runtime/intl/gettextP.h
+++ b/gettext-runtime/intl/gettextP.h
@@ -1,5 +1,5 @@
 /* Header describing internals of libintl library.
-   Copyright (C) 1995-1999, 2000-2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2007, 2009-2010 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
    This program is free software; you can redistribute it and/or modify it
@@ -238,6 +238,9 @@ extern void _nl_locale_name_canonicalize (char *name);
 # define gl_locale_name_thread_unsafe _nl_locale_name_thread_unsafe
 extern const char *_nl_locale_name_thread_unsafe (int category,
                                                  const char *categoryname);
+# define gl_locale_name_thread _nl_locale_name_thread
+/* extern const char *_nl_locale_name_thread (int category,
+                                             const char *categoryname); */
 # define gl_locale_name_posix _nl_locale_name_posix
 extern const char *_nl_locale_name_posix (int category,
                                          const char *categoryname);