fix lib/localename.c

[Bruno Haible]

lib/localename.c does not compile any more on some systems, after Microsoft
changed the value of SUBLANG_SINDHI_PAKISTAN from 1 to 2. They did so while
fixing their Sindhi locales. (They had "forgotten" that 4 million people in
India are speaking Sindhi.)

2008-04-16  Bruno Haible  <address@hidden>

        * lib/localename.c (SUBLANG_SINDHI_INDIA): New macro.
        (SUBLANG_SINDHI_PAKISTAN): Change value from 1 to 2.
        (gl_locale_name_from_win32_LANGID): Fix code for Sindhi.
        Reported by Daniel Bergström <address@hidden>.

*** lib/localename.c    26 Dec 2007 16:07:05 -0000      1.20
--- lib/localename.c    17 Apr 2008 02:28:24 -0000
***************
*** 1,5 ****
  /* Determine name of the currently selected locale.
!    Copyright (C) 1995-1999, 2000-2007 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published
--- 1,5 ----
  /* Determine name of the currently selected locale.
!    Copyright (C) 1995-1999, 2000-2008 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify it
     under the terms of the GNU Library General Public License as published
***************
*** 612,620 ****
  # ifndef SUBLANG_SERBIAN_CYRILLIC
  # define SUBLANG_SERBIAN_CYRILLIC 0x03
  # endif
! # ifndef SUBLANG_SINDHI_PAKISTAN
! # define SUBLANG_SINDHI_PAKISTAN 0x01
  # endif
  # ifndef SUBLANG_SINDHI_AFGHANISTAN
  # define SUBLANG_SINDHI_AFGHANISTAN 0x02
  # endif
--- 612,622 ----
  # ifndef SUBLANG_SERBIAN_CYRILLIC
  # define SUBLANG_SERBIAN_CYRILLIC 0x03
  # endif
! # ifndef SUBLANG_SINDHI_INDIA
! # define SUBLANG_SINDHI_INDIA 0x01
  # endif
+ # undef SUBLANG_SINDHI_PAKISTAN
+ # define SUBLANG_SINDHI_PAKISTAN 0x02
  # ifndef SUBLANG_SINDHI_AFGHANISTAN
  # define SUBLANG_SINDHI_AFGHANISTAN 0x02
  # endif
***************
*** 1338,1345 ****
        case LANG_SINDHI:
        switch (sub)
          {
          case SUBLANG_SINDHI_PAKISTAN: return "sd_PK";
!         case SUBLANG_SINDHI_AFGHANISTAN: return "sd_AF";
          }
        return "sd";
        case LANG_SINHALESE: return "si_LK";
--- 1340,1348 ----
        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";