[haiku-commits] r37393 - in haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc: iconv intl locale locale/bits

  • From: zooey@xxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 4 Jul 2010 18:58:35 +0200 (CEST)

Author: zooey
Date: 2010-07-04 18:58:35 +0200 (Sun, 04 Jul 2010)
New Revision: 37393
Changeset: http://dev.haiku-os.org/changeset/37393/haiku

Removed:
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/Depend
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/Makefile
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/Versions
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/bindtextdom.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/dcgettext.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/dcigettext.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/dcngettext.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/dgettext.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/dngettext.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/explodename.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/finddomain.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/gettext.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/gettextP.h
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/gmo.h
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/l10nflist.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/libintl.h
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/loadmsgcat.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/locale.alias
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/localealias.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/ngettext.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/plural-eval.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/plural-exp.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/plural-exp.h
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/plural.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/plural.y
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/po2test.sed
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/textdomain.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/translit.po
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/tst-codeset.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/tst-codeset.sh
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/tst-gettext.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/tst-gettext.sh
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/tst-gettext2.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/tst-gettext2.sh
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/tst-ngettext.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/tst-translit.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/tst-translit.sh
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/tstcodeset.po
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/tstlang1.po
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/intl/tstlang2.po
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/C-address.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/C-identification.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/C-measurement.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/C-name.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/C-paper.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/C-telephone.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/Makefile
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/SYS_libc.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/Versions
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/duplocale.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/findlocale.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/freelocale.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/global-locale.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/hashval.h
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/indigits.h
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/indigitswc.h
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/iso-3166.def
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/iso-4217.def
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/iso-639.def
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/lc-address.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/lc-identification.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/lc-measurement.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/lc-name.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/lc-paper.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/lc-telephone.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/lc-time.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/loadarchive.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/loadlocale.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/localeconv.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/localename.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/locarchive.h
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/newlocale.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/nl_langinfo.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/nl_langinfo_l.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/programs/
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/setlocale.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/strlen-hash.h
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/uselocale.c
Modified:
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/iconv/Jamfile
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/Jamfile
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/bits/locale.h
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/categories.def
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/langinfo.h
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/locale.h
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/localeinfo.h
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/xlocale.c
   
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/xlocale.h
Log:
* largish cleanup of glibc files (mostly with respect to locale-related stuff)

Modified: 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/iconv/Jamfile
===================================================================
--- 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/iconv/Jamfile
    2010-07-04 15:02:18 UTC (rev 37392)
+++ 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/iconv/Jamfile
    2010-07-04 16:58:35 UTC (rev 37393)
@@ -8,7 +8,6 @@
 SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc ctype ;
 SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc iconv ;
 SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc locale ;
-#SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc string ;
 SubDirSysHdrs $(HAIKU_TOP) src system libroot posix glibc ;
 
 SubDirCcFlags -D_GNU_SOURCE -DUSE_IN_LIBIO ;
@@ -18,7 +17,6 @@
        gconv_cache.c
        gconv_conf.c
        gconv_db.c
-#      gconv_dl.c
        gconv_simple.c
        gconv_trans.c
 ;

Modified: 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/Jamfile
===================================================================
--- 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/Jamfile
   2010-07-04 15:02:18 UTC (rev 37392)
+++ 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/Jamfile
   2010-07-04 16:58:35 UTC (rev 37393)
@@ -10,34 +10,19 @@
 SubDirCcFlags -D_GNU_SOURCE -DUSE_IN_LIBIO -DLOCALEDIR=\'\"/share/locale\"\' ;
 
 MergeObject posix_gnu_locale.o :
-       C-address.c
        C-collate.c
        C-ctype.c
-       C-identification.c
-       C-measurement.c
        C-messages.c
        C-monetary.c
-       C-name.c
        C-numeric.c
-       C-paper.c
-       C-telephone.c
        C-time.c
        C_name.c
        coll-lookup.c
-#      findlocale.c
-       lc-address.c
        lc-collate.c
        lc-ctype.c
-       lc-identification.c
-       lc-measurement.c
        lc-messages.c
        lc-monetary.c
-       lc-name.c
        lc-numeric.c
-       lc-paper.c
-       lc-telephone.c
-#      lc-time.c
        mb_cur_max.c
-#      setlocale.c
        xlocale.c
 ;

Modified: 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/bits/locale.h
===================================================================
--- 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/bits/locale.h
     2010-07-04 15:02:18 UTC (rev 37392)
+++ 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/bits/locale.h
     2010-07-04 16:58:35 UTC (rev 37393)
@@ -33,12 +33,6 @@
   __LC_MONETARY = 4,
   __LC_MESSAGES = 5,
   __LC_ALL = 6,
-  __LC_PAPER = 7,
-  __LC_NAME = 8,
-  __LC_ADDRESS = 9,
-  __LC_TELEPHONE = 10,
-  __LC_MEASUREMENT = 11,
-  __LC_IDENTIFICATION = 12
 };
 
 #endif /* bits/locale.h */

Modified: 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/categories.def
===================================================================
--- 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/categories.def
    2010-07-04 15:02:18 UTC (rev 37392)
+++ 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/categories.def
    2010-07-04 16:58:35 UTC (rev 37393)
@@ -260,85 +260,3 @@
   DEFINE_ELEMENT (NOSTR,   "nostr",   opt, string)
   DEFINE_ELEMENT (_NL_MESSAGES_CODESET, "messages-codeset", std, string)
   ), NO_POSTLOAD)
-
-DEFINE_CATEGORY
-(
- LC_PAPER, "LC_PAPER",
- (
-  DEFINE_ELEMENT (_NL_PAPER_HEIGHT, "height", std, word)
-  DEFINE_ELEMENT (_NL_PAPER_WIDTH,  "width",  std, word)
-  DEFINE_ELEMENT (_NL_PAPER_CODESET, "paper-codeset", std, string)
-  ), NO_POSTLOAD)
-
-DEFINE_CATEGORY
-(
- LC_NAME, "LC_NAME",
- (
-  DEFINE_ELEMENT (_NL_NAME_NAME_FMT,  "name_fmt",  std, string)
-  DEFINE_ELEMENT (_NL_NAME_NAME_GEN,  "name_gen",  std, string)
-  DEFINE_ELEMENT (_NL_NAME_NAME_MR,   "name_mr",   std, string)
-  DEFINE_ELEMENT (_NL_NAME_NAME_MRS,  "name_mrs",  std, string)
-  DEFINE_ELEMENT (_NL_NAME_NAME_MISS, "name_miss", std, string)
-  DEFINE_ELEMENT (_NL_NAME_NAME_MS,   "name_ms",   std, string)
-  DEFINE_ELEMENT (_NL_NAME_CODESET,   "name-codeset", std, string)
-  ), NO_POSTLOAD)
-
-DEFINE_CATEGORY
-(
- LC_ADDRESS, "LC_ADDRESS",
- (
-  DEFINE_ELEMENT (_NL_ADDRESS_POSTAL_FMT,      "postal_fmt",      std, string)
-  DEFINE_ELEMENT (_NL_ADDRESS_COUNTRY_NAME,    "country_name",    std, string)
-  DEFINE_ELEMENT (_NL_ADDRESS_COUNTRY_POST,    "country_post",    std, string)
-  DEFINE_ELEMENT (_NL_ADDRESS_COUNTRY_AB2,     "country_ab2",     std, string)
-  DEFINE_ELEMENT (_NL_ADDRESS_COUNTRY_AB3,     "country_ab3",     std, string)
-  DEFINE_ELEMENT (_NL_ADDRESS_COUNTRY_CAR,     "country_car",     std, string)
-  DEFINE_ELEMENT (_NL_ADDRESS_COUNTRY_NUM,     "country_num",     std, word)
-  DEFINE_ELEMENT (_NL_ADDRESS_COUNTRY_ISBN,    "country_isbn",    std, string)
-  DEFINE_ELEMENT (_NL_ADDRESS_LANG_NAME,       "lang_name",       std, string)
-  DEFINE_ELEMENT (_NL_ADDRESS_LANG_AB,         "lang_ab",         std, string)
-  DEFINE_ELEMENT (_NL_ADDRESS_LANG_TERM,       "lang_term",       std, string)
-  DEFINE_ELEMENT (_NL_ADDRESS_LANG_LIB,        "lang_lib",        std, string)
-  DEFINE_ELEMENT (_NL_ADDRESS_CODESET,        "address-codeset", std, string)
-  ), NO_POSTLOAD)
-
-DEFINE_CATEGORY
-(
- LC_TELEPHONE, "LC_TELEPHONE",
- (
-  DEFINE_ELEMENT (_NL_TELEPHONE_TEL_INT_FMT, "tel_int_fmt", std, string)
-  DEFINE_ELEMENT (_NL_TELEPHONE_TEL_DOM_FMT, "tel_dom_fmt", std, string)
-  DEFINE_ELEMENT (_NL_TELEPHONE_INT_SELECT,  "int_select",  std, string)
-  DEFINE_ELEMENT (_NL_TELEPHONE_INT_PREFIX,  "int_prefix",  std, string)
-  DEFINE_ELEMENT (_NL_TELEPHONE_CODESET,     "telephone-codeset", std, string)
-  ), NO_POSTLOAD)
-
-DEFINE_CATEGORY
-(
- LC_MEASUREMENT, "LC_MEASUREMENT",
- (
-  DEFINE_ELEMENT (_NL_MEASUREMENT_MEASUREMENT, "measurement", std, byte)
-  DEFINE_ELEMENT (_NL_MEASUREMENT_CODESET,     "measurement-codeset", std, 
string)
-  ), NO_POSTLOAD)
-
-DEFINE_CATEGORY
-(
- LC_IDENTIFICATION, "LC_IDENTIFICATION",
- (
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_TITLE,        "title",        std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_SOURCE,       "source",       std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_ADDRESS,      "address",      std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_CONTACT,      "contact",      std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_EMAIL,        "email",        std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_TEL,          "tel",          std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_FAX,          "fax",          std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_LANGUAGE,     "language",     std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_TERRITORY,    "territory",    std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_AUDIENCE,     "audience",     std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_APPLICATION,  "applcation",   std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_ABBREVIATION, "abbreviation", std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_REVISION,     "revision",     std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_DATE,         "date",         std, string)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_CATEGORY,     "category",     std, 
stringarray, 13, 13)
-  DEFINE_ELEMENT (_NL_IDENTIFICATION_CODESET,     "identification-codeset", 
std, string)
-  ), NO_POSTLOAD)

Modified: 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/langinfo.h
===================================================================
--- 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/langinfo.h
        2010-07-04 15:02:18 UTC (rev 37392)
+++ 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/langinfo.h
        2010-07-04 16:58:35 UTC (rev 37393)
@@ -503,64 +503,7 @@
   _NL_MESSAGES_CODESET,
   _NL_NUM_LC_MESSAGES,
 
-  _NL_PAPER_HEIGHT = _NL_ITEM (__LC_PAPER, 0),
-  _NL_PAPER_WIDTH,
-  _NL_PAPER_CODESET,
-  _NL_NUM_LC_PAPER,
 
-  _NL_NAME_NAME_FMT = _NL_ITEM (__LC_NAME, 0),
-  _NL_NAME_NAME_GEN,
-  _NL_NAME_NAME_MR,
-  _NL_NAME_NAME_MRS,
-  _NL_NAME_NAME_MISS,
-  _NL_NAME_NAME_MS,
-  _NL_NAME_CODESET,
-  _NL_NUM_LC_NAME,
-
-  _NL_ADDRESS_POSTAL_FMT = _NL_ITEM (__LC_ADDRESS, 0),
-  _NL_ADDRESS_COUNTRY_NAME,
-  _NL_ADDRESS_COUNTRY_POST,
-  _NL_ADDRESS_COUNTRY_AB2,
-  _NL_ADDRESS_COUNTRY_AB3,
-  _NL_ADDRESS_COUNTRY_CAR,
-  _NL_ADDRESS_COUNTRY_NUM,
-  _NL_ADDRESS_COUNTRY_ISBN,
-  _NL_ADDRESS_LANG_NAME,
-  _NL_ADDRESS_LANG_AB,
-  _NL_ADDRESS_LANG_TERM,
-  _NL_ADDRESS_LANG_LIB,
-  _NL_ADDRESS_CODESET,
-  _NL_NUM_LC_ADDRESS,
-
-  _NL_TELEPHONE_TEL_INT_FMT = _NL_ITEM (__LC_TELEPHONE, 0),
-  _NL_TELEPHONE_TEL_DOM_FMT,
-  _NL_TELEPHONE_INT_SELECT,
-  _NL_TELEPHONE_INT_PREFIX,
-  _NL_TELEPHONE_CODESET,
-  _NL_NUM_LC_TELEPHONE,
-
-  _NL_MEASUREMENT_MEASUREMENT = _NL_ITEM (__LC_MEASUREMENT, 0),
-  _NL_MEASUREMENT_CODESET,
-  _NL_NUM_LC_MEASUREMENT,
-
-  _NL_IDENTIFICATION_TITLE = _NL_ITEM (__LC_IDENTIFICATION, 0),
-  _NL_IDENTIFICATION_SOURCE,
-  _NL_IDENTIFICATION_ADDRESS,
-  _NL_IDENTIFICATION_CONTACT,
-  _NL_IDENTIFICATION_EMAIL,
-  _NL_IDENTIFICATION_TEL,
-  _NL_IDENTIFICATION_FAX,
-  _NL_IDENTIFICATION_LANGUAGE,
-  _NL_IDENTIFICATION_TERRITORY,
-  _NL_IDENTIFICATION_AUDIENCE,
-  _NL_IDENTIFICATION_APPLICATION,
-  _NL_IDENTIFICATION_ABBREVIATION,
-  _NL_IDENTIFICATION_REVISION,
-  _NL_IDENTIFICATION_DATE,
-  _NL_IDENTIFICATION_CATEGORY,
-  _NL_IDENTIFICATION_CODESET,
-  _NL_NUM_LC_IDENTIFICATION,
-
   /* This marks the highest value used.  */
   _NL_NUM
 };

Modified: 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/locale.h
===================================================================
--- 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/locale.h
  2010-07-04 15:02:18 UTC (rev 37392)
+++ 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/locale.h
  2010-07-04 16:58:35 UTC (rev 37393)
@@ -40,12 +40,6 @@
 #define LC_MONETARY       __LC_MONETARY
 #define LC_MESSAGES       __LC_MESSAGES
 #define        LC_ALL            __LC_ALL
-#define LC_PAPER         __LC_PAPER
-#define LC_NAME                  __LC_NAME
-#define LC_ADDRESS       __LC_ADDRESS
-#define LC_TELEPHONE     __LC_TELEPHONE
-#define LC_MEASUREMENT   __LC_MEASUREMENT
-#define LC_IDENTIFICATION __LC_IDENTIFICATION
 
 
 /* Structure giving information about numeric and monetary notation.  */

Modified: 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/localeinfo.h
===================================================================
--- 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/localeinfo.h
      2010-07-04 15:02:18 UTC (rev 37392)
+++ 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/localeinfo.h
      2010-07-04 16:58:35 UTC (rev 37393)
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 
 /* This has to be changed whenever a new locale is defined.  */
-#define __LC_LAST      13
+#define __LC_LAST      7
 
 #include <intl/loadinfo.h>     /* For loaded_l10nfile definition.  */
 

Modified: 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/xlocale.c
===================================================================
--- 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/xlocale.c
 2010-07-04 15:02:18 UTC (rev 37392)
+++ 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/xlocale.c
 2010-07-04 16:58:35 UTC (rev 37393)
@@ -42,12 +42,6 @@
       [LC_COLLATE] = &_nl_C_LC_COLLATE,
       [LC_MONETARY] = &_nl_C_LC_MONETARY,
       [LC_MESSAGES] = &_nl_C_LC_MESSAGES,
-      [LC_PAPER] = &_nl_C_LC_PAPER,
-      [LC_NAME] = &_nl_C_LC_NAME,
-      [LC_ADDRESS] = &_nl_C_LC_ADDRESS,
-      [LC_TELEPHONE] = &_nl_C_LC_TELEPHONE,
-      [LC_MEASUREMENT] = &_nl_C_LC_MEASUREMENT,
-      [LC_IDENTIFICATION] = &_nl_C_LC_IDENTIFICATION
     },
     .__ctype_b = (const unsigned short int *) _nl_C_LC_CTYPE_class + 128,
     .__ctype_tolower = (const int *) _nl_C_LC_CTYPE_tolower + 128,

Modified: 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/xlocale.h
===================================================================
--- 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/xlocale.h
 2010-07-04 15:02:18 UTC (rev 37392)
+++ 
haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc/locale/xlocale.h
 2010-07-04 16:58:35 UTC (rev 37393)
@@ -28,7 +28,7 @@
 typedef struct __locale_struct
 {
   /* Note: LC_ALL is not a valid index into this array.  */
-  struct locale_data *__locales[13]; /* 13 = __LC_LAST. */
+  struct locale_data *__locales[7]; /* 7 = __LC_LAST. */
 
   /* To increase the speed of this solution we add some special members.  */
   const unsigned short int *__ctype_b;


Other related posts:

  • » [haiku-commits] r37393 - in haiku/branches/developer/zooey/posix-locale/src/system/libroot/posix/glibc: iconv intl locale locale/bits - zooey