summaryrefslogtreecommitdiff
path: root/ctype
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-03-06 03:05:42 +0000
committerRoland McGrath <roland@gnu.org>1995-03-06 03:05:42 +0000
commit797fa6204a2f642a84c379033e182863c39bdcef (patch)
tree198944e7b38012e3bf513426134570d687dcd6d0 /ctype
parent933e73facc338fb81f1f72af416ea57fbf439a2f (diff)
* ctype/ctype-info.c: For initial tables, use
_nl_C_LC_CTYPE_{class,toupper,tolower} constant tables defined in locale/C-ctype.c.
Diffstat (limited to 'ctype')
-rw-r--r--ctype/ctype-info.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/ctype/ctype-info.c b/ctype/ctype-info.c
index 2a1e596223..61f881bb01 100644
--- 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);