summaryrefslogtreecommitdiff
path: root/intl/loadinfo.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-07-24 10:07:08 +0000
committerUlrich Drepper <drepper@redhat.com>2002-07-24 10:07:08 +0000
commite155c80135043ce7582a5cb8623142c8ca14cbe5 (patch)
tree04dfe662eccf94461c6cdc9f47c89ad2a733fa59 /intl/loadinfo.h
parent7e93f91553018f1e24c3610da694a51ffb7f7021 (diff)
downloadglibc-e155c80135043ce7582a5cb8623142c8ca14cbe5.tar.gz
Remove support for CEN-style locale variables. It was never used and shouldn't be since it's not portable.
Diffstat (limited to 'intl/loadinfo.h')
-rw-r--r--intl/loadinfo.h27
1 files changed, 8 insertions, 19 deletions
diff --git a/intl/loadinfo.h b/intl/loadinfo.h
index 1de6cfd24b..340535a4d3 100644
--- a/intl/loadinfo.h
+++ b/intl/loadinfo.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1998,1999,2000,2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -39,17 +39,10 @@
#endif
/* Encoding of locale name parts. */
-#define CEN_REVISION 1
-#define CEN_SPONSOR 2
-#define CEN_SPECIAL 4
-#define XPG_NORM_CODESET 8
-#define XPG_CODESET 16
-#define TERRITORY 32
-#define CEN_AUDIENCE 64
-#define XPG_MODIFIER 128
-
-#define CEN_SPECIFIC (CEN_REVISION|CEN_SPONSOR|CEN_SPECIAL|CEN_AUDIENCE)
-#define XPG_SPECIFIC (XPG_CODESET|XPG_NORM_CODESET|XPG_MODIFIER)
+#define XPG_NORM_CODESET 1
+#define XPG_CODESET 2
+#define XPG_TERRITORY 4
+#define XPG_MODIFIER 8
struct loaded_l10nfile
@@ -77,9 +70,8 @@ _nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list,
const char *language, const char *territory,
const char *codeset,
const char *normalized_codeset,
- const char *modifier, const char *special,
- const char *sponsor, const char *revision,
- const char *filename, int do_allocate));
+ const char *modifier, const char *filename,
+ int do_allocate));
extern const char *_nl_expand_alias PARAMS ((const char *name));
@@ -90,10 +82,7 @@ extern int _nl_explode_name PARAMS ((char *name, const char **language,
const char **modifier,
const char **territory,
const char **codeset,
- const char **normalized_codeset,
- const char **special,
- const char **sponsor,
- const char **revision));
+ const char **normalized_codeset));
extern char *_nl_find_language PARAMS ((const char *name));