about summary refs log tree commit diff
path: root/locale/locale.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-01-26 09:22:30 +0000
committerUlrich Drepper <drepper@redhat.com>2001-01-26 09:22:30 +0000
commit3e154a6f9373a15924ffe226df044194b633e3ac (patch)
tree3ebb34aed6cf135cdc3006b20b54dda86e43e4e1 /locale/locale.h
parent97ac0eafb88c12e24898a1a9fbf686446f944d10 (diff)
downloadglibc-3e154a6f9373a15924ffe226df044194b633e3ac.tar.gz
glibc-3e154a6f9373a15924ffe226df044194b633e3ac.tar.xz
glibc-3e154a6f9373a15924ffe226df044194b633e3ac.zip
Update.
	* locale/Makefile (headers): Add bits/locale.h.
	* locale/langinfo.h: Don't include <locale.h>.  Include <bits/locale.h>
	and use __LC_ constants instead of LC_.
	* locale/locale.h: Include <bits/locale.h> and define LC_ constants
	using __LC_ constants.
	* locale/bits/locale.h: New file.
	* locale/loadlocale.c: Include <locale.h>.
	* locale/nl_langinfo.h: Likewise.
Diffstat (limited to 'locale/locale.h')
-rw-r--r--locale/locale.h29
1 files changed, 15 insertions, 14 deletions
diff --git a/locale/locale.h b/locale/locale.h
index 5afa10c4dc..c17babc33e 100644
--- a/locale/locale.h
+++ b/locale/locale.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,95,96,97,98,99,2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,1995-1999,2000,2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -27,24 +27,25 @@
 
 #define __need_NULL
 #include <stddef.h>
+#include <bits/locale.h>
 
 __BEGIN_DECLS
 
 /* These are the possibilities for the first argument to setlocale.
    The code assumes that the lowest LC_* symbol has the value zero.  */
-#define LC_CTYPE          0
-#define LC_NUMERIC        1
-#define LC_TIME           2
-#define LC_COLLATE        3
-#define LC_MONETARY       4
-#define LC_MESSAGES       5
-#define	LC_ALL		  6
-#define LC_PAPER	  7
-#define LC_NAME		  8
-#define LC_ADDRESS	  9
-#define LC_TELEPHONE	  10
-#define LC_MEASUREMENT	  11
-#define LC_IDENTIFICATION 12
+#define LC_CTYPE          __LC_CTYPE
+#define LC_NUMERIC        __LC_NUMERIC
+#define LC_TIME           __LC_TIME
+#define LC_COLLATE        __LC_COLLATE
+#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.  */