* ctype/ctype-info.c: For initial tables, use

	_nl_C_LC_CTYPE_{class,toupper,tolower} constant tables defined in
	locale/C-ctype.c.

diff --git a/ChangeLog b/ChangeLog
index 215aca0..57c73d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@ Sun Mar  5 19:40:13 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
        (categories): New variable.
        (aux): Use that to get C-category and lc-category.
        * ctype/ctype.h (_IS*): Use independent bits for all but _ISalnum.
+       * ctype/ctype-info.c: For initial tables, use
+       _nl_C_LC_CTYPE_{class,toupper,tolower} constant tables defined in
+       locale/C-ctype.c. 
        * locale/C-ctype.c, locale/C-messages.c: New files.
        * locale/C-monetary.c, locale/C-numeric.c, locale/C-time.c:
        Default "C" locale data updated for new locale system.

diff --git a/ctype/ctype-info.c b/ctype/ctype-info.c
index 2a1e596..61f881b 100644 (file)
--- a/ctype/ctype-info.c
+++ b/ctype/ctype-info.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995 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
@@ -16,15 +16,16 @@ License along with the GNU C Library; see the file COPYING.LIB.  If
 not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
-#include <ansidecl.h>
 #include <ctype.h>
-#include <localeinfo.h>
+#include "../locale/localeinfo.h"
 
-/* Defined in locale/locale-C-ct.c.  */
-extern CONST unsigned short int __ctype_b_C[];
-extern CONST short int __ctype_tolower_C[];
-extern CONST short int __ctype_toupper_C[];
+/* Defined in locale/C-ctype.c.  */
+extern const char _nl_C_LC_CTYPE_class[];
+extern const char _nl_C_LC_CTYPE_toupper[];
+extern const char _nl_C_LC_CTYPE_tolower[];
 
-CONST unsigned short int *__ctype_b = __ctype_b_C + 1;
-CONST short int *__ctype_tolower = __ctype_tolower_C + 1;
-CONST short int *__ctype_toupper = __ctype_toupper_C + 1;
+#define b(u,x) (((u short int *) _nl_C_LC_CTYPE_##x) + 128);
+
+const unsigned short int *__ctype_b = b(unsigned, class);
+const short int *__ctype_tolower = b(, tolower);
+const short int *__ctype_toupper = b(, toupper);

diff --git a/localeinfo.h b/localeinfo.h
deleted file mode 100644 (file)
index 7b0f3e0..0000000
--- a/localeinfo.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <locale/localeinfo.h>