From: Bruno Haible <bruno@clisp.org>
Date: Tue, 27 May 2008 22:55:17 +0000 (+0200)
Subject: Make localename.c compile with current mingw.
X-Git-Tag: v0.1~7339
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=10ebf73a0aa100e252bf3771e8222743477fc919;p=gnulib.git

Make localename.c compile with current mingw.
---

diff --git a/ChangeLog b/ChangeLog
index eb22c0f9c..b99f538e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 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'.
 	* modules/striconv (Link): Likewise.
 	* modules/striconveh (Link): Likewise.
diff --git a/lib/localename.c b/lib/localename.c
index f2e1f4167..9f4c18191 100644
--- 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