Re: can't build gettext-0.16.1 in Mingw in Windows XP

[Bruno Haible]

Hello,

haibin zhang wrote:
> can't build gettext-0.16.1 in  Mingw in Windows XP, when I compile it ,
> it occur error: 
> 
> -DHAVE_CONFIG_H -I. -I. -I.. -I/mingw/include -O2   ./localename.c
>  gcc -c -DLOCALEDIR=\"/mingw/share/locale\" 
> -DLOCALE_ALIAS_PATH=\"/mingw/share/locale\" -DLIBDIR=\"/mingw/lib\" 
> -DBUILDING_LI
> BINTL -DBUILDING_DLL -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY 
> -DINSTALLDIR=\"/mingw/lib\" -DNO_XMALLOC -Dset_relocati
> on_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate 
> -DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H -I. -I. -I.. -I/m
> ingw/include -O2 ./localename.c  -DDLL_EXPORT -DPIC -o .libs/localename.o
> ./localename.c: In function `_nl_locale_name_default':
> ./localename.c:1145: error: duplicate case value
> ./localename.c:1144: error: previously used here

Please use this patch.

Bruno


2006-12-21  Bruno Haible  <address@hidden>

        * localename.c (SUBLANG_BENGALI_INDIA): Change value from 0 to 1.
        (SUBLANG_BENGALI_BANGLADESH): Change value from 1 to 2.
        (SUBLANG_PUNJABI_INDIA): Change value from 0 to 1.
        (SUBLANG_PUNJABI_PAKISTAN): Change value from 1 to 2.
        (SUBLANG_ROMANIAN_ROMANIA): Change value from 0 to 1.
        (SUBLANG_ROMANIAN_MOLDOVA): Change value from 1 to 2.
        (SUBLANG_SINDHI_INDIA): Remove macro.
        (SUBLANG_SINDHI_AFGHANISTAN): New macro.
        (SUBLANG_TAMAZIGHT_ALGERIA_LATIN): Renamed from
        SUBLANG_TAMAZIGHT_LATIN.
        (SUBLANG_TIGRINYA_ETHIOPIA): Change value from 0 to 1.
        (SUBLANG_TIGRINYA_ERITREA): Change value from 1 to 2.
        (_nl_locale_name_default): Update.
        Reported by Bob Rossi <address@hidden>.

--- localename.c        25 Oct 2006 11:43:26 -0000      1.15
+++ localename.c        21 Dec 2006 14:26:42 -0000
@@ -494,10 +494,10 @@
 # define SUBLANG_AZERI_CYRILLIC 0x02
 # endif
 # ifndef SUBLANG_BENGALI_INDIA
-# define SUBLANG_BENGALI_INDIA 0x00
+# define SUBLANG_BENGALI_INDIA 0x01
 # endif
 # ifndef SUBLANG_BENGALI_BANGLADESH
-# define SUBLANG_BENGALI_BANGLADESH 0x01
+# define SUBLANG_BENGALI_BANGLADESH 0x02
 # endif
 # ifndef SUBLANG_CHINESE_MACAU
 # define SUBLANG_CHINESE_MACAU 0x05
@@ -590,16 +590,16 @@
 # define SUBLANG_NEPALI_INDIA 0x02
 # endif
 # ifndef SUBLANG_PUNJABI_INDIA
-# define SUBLANG_PUNJABI_INDIA 0x00
+# define SUBLANG_PUNJABI_INDIA 0x01
 # endif
 # ifndef SUBLANG_PUNJABI_PAKISTAN
-# define SUBLANG_PUNJABI_PAKISTAN 0x01
+# define SUBLANG_PUNJABI_PAKISTAN 0x02
 # endif
 # ifndef SUBLANG_ROMANIAN_ROMANIA
-# define SUBLANG_ROMANIAN_ROMANIA 0x00
+# define SUBLANG_ROMANIAN_ROMANIA 0x01
 # endif
 # ifndef SUBLANG_ROMANIAN_MOLDOVA
-# define SUBLANG_ROMANIAN_MOLDOVA 0x01
+# define SUBLANG_ROMANIAN_MOLDOVA 0x02
 # endif
 # ifndef SUBLANG_SERBIAN_LATIN
 # define SUBLANG_SERBIAN_LATIN 0x02
@@ -607,12 +607,12 @@
 # ifndef SUBLANG_SERBIAN_CYRILLIC
 # define SUBLANG_SERBIAN_CYRILLIC 0x03
 # endif
-# ifndef SUBLANG_SINDHI_INDIA
-# define SUBLANG_SINDHI_INDIA 0x00
-# endif
 # ifndef SUBLANG_SINDHI_PAKISTAN
 # define SUBLANG_SINDHI_PAKISTAN 0x01
 # endif
+# ifndef SUBLANG_SINDHI_AFGHANISTAN
+# define SUBLANG_SINDHI_AFGHANISTAN 0x02
+# endif
 # ifndef SUBLANG_SPANISH_GUATEMALA
 # define SUBLANG_SPANISH_GUATEMALA 0x04
 # endif
@@ -670,14 +670,14 @@
 # ifndef SUBLANG_TAMAZIGHT_ARABIC
 # define SUBLANG_TAMAZIGHT_ARABIC 0x01
 # endif
-# ifndef SUBLANG_TAMAZIGHT_LATIN
-# define SUBLANG_TAMAZIGHT_LATIN 0x02
+# ifndef SUBLANG_TAMAZIGHT_ALGERIA_LATIN
+# define SUBLANG_TAMAZIGHT_ALGERIA_LATIN 0x02
 # endif
 # ifndef SUBLANG_TIGRINYA_ETHIOPIA
-# define SUBLANG_TIGRINYA_ETHIOPIA 0x00
+# define SUBLANG_TIGRINYA_ETHIOPIA 0x01
 # endif
 # ifndef SUBLANG_TIGRINYA_ERITREA
-# define SUBLANG_TIGRINYA_ERITREA 0x01
+# define SUBLANG_TIGRINYA_ERITREA 0x02
 # endif
 # ifndef SUBLANG_URDU_PAKISTAN
 # define SUBLANG_URDU_PAKISTAN 0x01
@@ -1378,8 +1378,8 @@
       case LANG_SINDHI:
        switch (sub)
          {
-         case SUBLANG_SINDHI_INDIA: return "sd_IN";
          case SUBLANG_SINDHI_PAKISTAN: return "sd_PK";
+         case SUBLANG_SINDHI_AFGHANISTAN: return "sd_AF";
          }
        return "sd";
       case LANG_SINHALESE: return "si_LK";
@@ -1432,7 +1432,7 @@
          {
          /* FIXME: Adjust this when Tamazight locales appear on Unix.  */
          case SUBLANG_TAMAZIGHT_ARABIC: return "address@hidden";
-         case SUBLANG_TAMAZIGHT_LATIN: return "address@hidden";
+         case SUBLANG_TAMAZIGHT_ALGERIA_LATIN: return "address@hidden";
          }
        return "ber_MA";
       case LANG_TAMIL: