Re: mingw build error

[Bruno Haible]

Karl Berry wrote:
> On Tue, Dec 19, 2006 at 07:07:14PM -0600, Karl Berry wrote:
> >     If I preprocess the file, I see this,
> >      case 0x01: return "bn_IN";
> >      case 0x01: return "bn_BD";
> >     for the corresponding source,
> >      case SUBLANG_BENGALI_INDIA: return "bn_IN";
> >      case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
> > 
> > Well, texinfo is just copying that file from gettext.  I am not sure
> > what can be done in general.  What system are you on?  It seems like a
> > potential bug in the headers somewhere for them to be defined as the
> > same value.  Bruno, any thoughts?  See full msg below.
> 
> This is compiled nativly on mingw. Are you suggesting this is not a
> texinfo bug, but a gettext bug?

I'm applying this patch to gettext. I hope it fixes it.

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: