Make localename.c compile with current mingw.

diff --git a/ChangeLog b/ChangeLog
index eb22c0f9cecce518957e8eaaa24a3bfa872bddd5..b99f538e48ee3b7a227c636e11372dcd2344fd12 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-27  Bruno Haible  <bruno@clisp.org>
+
+       * lib/localename.c (SUBLANG_TIBETAN_BHUTAN): Force value 2. Needed for
+       current mingw.
+       Reported by Jose E. Marchesi <jemarch@gnu.org>.
+
 2008-05-27  Bruno Haible  <bruno@clisp.org>
 
        * modules/iconv_open (Link): New section, from module 'iconv'.

diff --git a/lib/localename.c b/lib/localename.c
index f2e1f4167fef7a7605aa3f540c14882f62ab05a5..9f4c18191debaa968a95de925386f66616657fbc 100644 (file)
--- a/lib/localename.c
+++ b/lib/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