summary refs log tree commit diff
path: root/locale/categories.def
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-05-18 09:00:09 +0000
committerRoland McGrath <roland@gnu.org>1995-05-18 09:00:09 +0000
commit2b83a2a4d978012cdf78b648337c31091e20526d (patch)
tree6a5130b031f6815b6edbbb6e2b084c79ece15b1d /locale/categories.def
parent4f6dc78a9237bb327a1d694635be9b0f50cc395e (diff)
downloadglibc-2b83a2a4d978012cdf78b648337c31091e20526d.tar.gz
glibc-2b83a2a4d978012cdf78b648337c31091e20526d.tar.xz
glibc-2b83a2a4d978012cdf78b648337c31091e20526d.zip
Wed May 17 16:50:21 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
	Merged 1003.2 locale and localedef programs by Ulrich Drepper.
	* locale/charmap.c: New file.
	* locale/collate.c: New file.
	* locale/config.h: New file.
	* locale/ctype.c: New file.
	* locale/ctypedump.c: New file.
	* locale/hash.c: New file.
	* locale/hash.h: New file.
	* locale/iso-4217.def: New file.
	* locale/keyword.gperf: New file.
	* locale/keyword.h: New file.
	* locale/libintl.h: New file.
	* locale/locale.c: New file.
	* locale/localedef.c: New file.
	* locale/localedef.h: New file.
	* locale/locfile-lex.c: New file.
	* locale/locfile-parse.c: New file.
	* locale/messages.c: New file.
	* locale/monetary.c: New file.
	* locale/numeric.c: New file.
	* locale/token.h: New file.

	* posix/regex.c, posix/regex.h: New files, incorporated from GNU regex.
	* posix/Makefile (headers): Add regex.h.
	(routines): Add regex.
	(gpl2lgpl): Add regex.c and regex.h.

Tue May 16 17:35:07 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>

	* locale/loadlocale.c: Expect macro LOCALE_PATH to be defined,
 	instead of hard-coding "/share/locale".
Diffstat (limited to 'locale/categories.def')
-rw-r--r--locale/categories.def4
1 files changed, 4 insertions, 0 deletions
diff --git a/locale/categories.def b/locale/categories.def
index 6bdad35e17..be3c6bc549 100644
--- a/locale/categories.def
+++ b/locale/categories.def
@@ -101,6 +101,10 @@ DEFINE_CATEGORY (LC_TIME, "LC_TIME",
 		  { D_FMT,      "d_fmt",      std, string },
 		  { T_FMT,      "t_fmt",      std, string },
 		  { T_FMT_AMPM, "t_fmt_ampm", std, string },
+		  { ERA,        "era",        opt, string },
+		  { ERA_YEAR,   "era_year",   opt, string },
+		  { ERA_D_FMT,  "era_d_fmt",  opt, string },
+		  { ALT_DIGITS, "alt_digits", opt, stringarray,  0, 100 },
 		  { 0 }
 		  ), NO_POSTLOAD, NULL, NULL, NULL )