[src/trunk]: src/lib/libc/locale rename _CTYPE_x to _RUNETYPE_x for avoiding ...

[tshiozak <tshiozak%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ffd8a1db3f77
branches:  trunk
changeset: 544078:ffd8a1db3f77
user:      tshiozak <tshiozak%NetBSD.org@localhost>
date:      Mon Mar 10 21:18:48 2003 +0000

description:
rename _CTYPE_x to _RUNETYPE_x for avoiding compile error on FreeBSD.

diffstat:

 lib/libc/locale/rune.h     |  30 +++++++++++++++++++++++++++++-
 lib/libc/locale/runeglue.c |   6 +++---
 2 files changed, 32 insertions(+), 4 deletions(-)

diffs (69 lines):

diff -r 917d4152f39a -r ffd8a1db3f77 lib/libc/locale/rune.h
--- a/lib/libc/locale/rune.h    Mon Mar 10 20:50:22 2003 +0000
+++ b/lib/libc/locale/rune.h    Mon Mar 10 21:18:48 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rune.h,v 1.6 2003/03/10 20:41:29 tshiozak Exp $        */
+/*     $NetBSD: rune.h,v 1.7 2003/03/10 21:18:49 tshiozak Exp $        */
 
 /*-
  * Copyright (c) 1993
@@ -45,4 +45,32 @@
 #include <wchar.h>
 #include "runetype.h"
 
+/*
+ * map _RTYPE_x to _CTYPE_x
+ *
+ * XXX: these should be defined in ctype.h and used in isxxx macros.
+ *      (note: current isxxx macros use "old" NetBSD masks and
+ *       _CTYPE_x are not public.)
+ */
+#define        _CTYPE_A        _RUNETYPE_A
+#define        _CTYPE_C        _RUNETYPE_C
+#define        _CTYPE_D        _RUNETYPE_D
+#define        _CTYPE_G        _RUNETYPE_G
+#define        _CTYPE_L        _RUNETYPE_L
+#define        _CTYPE_P        _RUNETYPE_P
+#define        _CTYPE_S        _RUNETYPE_S
+#define        _CTYPE_U        _RUNETYPE_U
+#define        _CTYPE_X        _RUNETYPE_X
+#define        _CTYPE_B        _RUNETYPE_B
+#define        _CTYPE_R        _RUNETYPE_R
+#define        _CTYPE_I        _RUNETYPE_I
+#define        _CTYPE_T        _RUNETYPE_T
+#define        _CTYPE_Q        _RUNETYPE_Q
+#define        _CTYPE_SWM      _RUNETYPE_SWM
+#define        _CTYPE_SWS      _RUNETYPE_SWS
+#define        _CTYPE_SW0      _RUNETYPE_SW0
+#define        _CTYPE_SW1      _RUNETYPE_SW1
+#define        _CTYPE_SW2      _RUNETYPE_SW2
+#define        _CTYPE_SW3      _RUNETYPE_SW3
+
 #endif /*! _RUNE_H_ */
diff -r 917d4152f39a -r ffd8a1db3f77 lib/libc/locale/runeglue.c
--- a/lib/libc/locale/runeglue.c        Mon Mar 10 20:50:22 2003 +0000
+++ b/lib/libc/locale/runeglue.c        Mon Mar 10 21:18:48 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: runeglue.c,v 1.9 2002/03/17 22:14:30 tshiozak Exp $    */
+/*     $NetBSD: runeglue.c,v 1.10 2003/03/10 21:18:49 tshiozak Exp $   */
 
 /*-
  * Copyright (c)1999 Citrus Project,
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: runeglue.c,v 1.9 2002/03/17 22:14:30 tshiozak Exp $");
+__RCSID("$NetBSD: runeglue.c,v 1.10 2003/03/10 21:18:49 tshiozak Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #define _CTYPE_PRIVATE
@@ -47,7 +47,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wchar.h>
-#include "runetype.h"
+#include "rune.h"
 #include "rune_local.h"
 
 #if EOF != -1