Make it compile with current mingw.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 8e75ff7137f1110c3d2bb499bf1fe3f30da4f5a1..c2c0260b96fb090d84de64d194402f2e7002a801 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-27  Bruno Haible  <bruno@clisp.org>
+
+       * localename.c (SUBLANG_TIBETAN_BHUTAN): Force value 2. Needed for
+       current mingw.
+       Reported by Jose E. Marchesi <jemarch@gnu.org>.
+
 2008-04-21  Bruno Haible  <bruno@clisp.org>
 
        * localename.c (SUBLANG_TIBETAN_PRC, SUBLANG_TIBETAN_BHUTAN): Actually

diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c
index f2e1f4167fef7a7605aa3f540c14882f62ab05a5..9f4c18191debaa968a95de925386f66616657fbc 100644 (file)
--- a/gettext-runtime/intl/localename.c
+++ b/gettext-runtime/intl/localename.c
@@ -731,9 +731,8 @@
 # ifndef SUBLANG_TIBETAN_PRC
 # define SUBLANG_TIBETAN_PRC 0x01
 # endif
-# ifndef SUBLANG_TIBETAN_BHUTAN
+# undef SUBLANG_TIBETAN_BHUTAN
 # define SUBLANG_TIBETAN_BHUTAN 0x02
-# endif
 # ifndef SUBLANG_TIGRINYA_ETHIOPIA
 # define SUBLANG_TIGRINYA_ETHIOPIA 0x01
 # endif