about summary refs log tree commit diff
path: root/locale/lc-ctype.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-03-09 10:00:12 +0000
committerRoland McGrath <roland@gnu.org>1995-03-09 10:00:12 +0000
commit6c2f050742cfb5b3ff6ee96b106409f541eb53bc (patch)
treef7296a81b8d5524dddfa0aa1cc24342d8ef9ac24 /locale/lc-ctype.c
parent286351153566acc7dcc82834d90e0b8d87dff8be (diff)
downloadglibc-6c2f050742cfb5b3ff6ee96b106409f541eb53bc.tar.gz
glibc-6c2f050742cfb5b3ff6ee96b106409f541eb53bc.tar.xz
glibc-6c2f050742cfb5b3ff6ee96b106409f541eb53bc.zip
Wed Mar 8 13:38:13 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
	* posix/glob/configure.bat: Fixes from DJ.

	* time/backward, time/europe, time/northamerica, time/pacificnew,
	time/zdump.c, time/zic.c, time/tzfile.h, time/private.h,
	time/ialloc.c: Code and data updated from ADO's 95b.
	* time/emkdir.c: File removed.
	* time/Makefile (distribute, extra-objs, zic): Omit it.
	
	* time/localtime.c: Deansideclized.  Never #define __tzname et al
 	to non-__ names.

	* locale/lc-ctype.c (__ctype_tolower, __ctype_toupper): Use int *
 	instead of short int *.
	* ctype/ctype-info.c: Likewise.
	* ctype/ctype.h: Likewise.

	* locale/langinfo.h (_NL_CTYPE_CLASS): Use this (just one) instead
 	of EB and EL versions.
Diffstat (limited to 'locale/lc-ctype.c')
-rw-r--r--locale/lc-ctype.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/locale/lc-ctype.c b/locale/lc-ctype.c
index 9b72ad16eb..c634d12adb 100644
--- a/locale/lc-ctype.c
+++ b/locale/lc-ctype.c
@@ -40,12 +40,13 @@ _nl_postload_ctype (void)
 #else
 #error bizarre byte order
 #endif
+#define eval(x) x
 
 #define current(unsigned,x) \
-  ((const unsigned short int *) _NL_CURRENT (LC_CTYPE, bo(_NL_CTYPE_##x)) \
+  ((const unsigned int *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_##eval(x)) \
    + 128)
 
-  __ctype_b = current (unsigned, CLASS);
-  __ctype_toupper = current (, TOUPPER);
-  __ctype_tolower = current (, TOLOWER);
+  __ctype_b = current (unsigned short, CLASS);
+  __ctype_toupper = current (, bo (TOUPPER));
+  __ctype_tolower = current (, bo (TOLOWER));
 }