[src/trunk]: src rework bulid breakage problem on linux.

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

details:   https://anonhg.NetBSD.org/src/rev/9dbe1c20a5b2
branches:  trunk
changeset: 755099:9dbe1c20a5b2
user:      tnozaki <tnozaki%NetBSD.org@localhost>
date:      Sat May 22 18:15:21 2010 +0000

description:
rework bulid breakage problem on linux.

ldef.h: s/1<<8/_CTYPE_CACHE_SIZE/
ctype_local.h: use limits.h instead of machine/limits.h
runetype_local.h: don't use HAVE_NBTOOL_CONFIG as evil way.

diffstat:

 lib/libc/locale/ctype_local.h    |  4 ++--
 lib/libc/locale/runetype_local.h |  6 +-----
 usr.bin/mklocale/ldef.h          |  4 ++--
 3 files changed, 5 insertions(+), 9 deletions(-)

diffs (56 lines):

diff -r 52f1ce5f39ac -r 9dbe1c20a5b2 lib/libc/locale/ctype_local.h
--- a/lib/libc/locale/ctype_local.h     Sat May 22 17:47:25 2010 +0000
+++ b/lib/libc/locale/ctype_local.h     Sat May 22 18:15:21 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ctype_local.h,v 1.1 2010/05/22 06:38:15 tnozaki Exp $ */
+/* $NetBSD: ctype_local.h,v 1.2 2010/05/22 18:15:21 tnozaki Exp $ */
 
 /*-
  * Copyright (c) 2010 Citrus Project,
@@ -28,7 +28,7 @@
 #ifndef _CTYPE_LOCAL_H_
 #define _CTYPE_LOCAL_H_
 
-#include <machine/limits.h>
+#include <limits.h>
 
 #define _CTYPE_NUM_CHARS       (1 << CHAR_BIT)
 #define _CTYPE_CACHE_SIZE      (1 << 8)
diff -r 52f1ce5f39ac -r 9dbe1c20a5b2 lib/libc/locale/runetype_local.h
--- a/lib/libc/locale/runetype_local.h  Sat May 22 17:47:25 2010 +0000
+++ b/lib/libc/locale/runetype_local.h  Sat May 22 18:15:21 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: runetype_local.h,v 1.7 2010/05/22 17:47:25 tnozaki Exp $       */
+/*     $NetBSD: runetype_local.h,v 1.8 2010/05/22 18:15:21 tnozaki Exp $       */
 
 /*-
  * Copyright (c) 1993
@@ -40,11 +40,7 @@
 #include <sys/cdefs.h>
 #include <sys/types.h>
 
-#ifdef HAVE_NBTOOL_CONFIG_H
-#define _CTYPE_CACHE_SIZE      (1 << 8)
-#else
 #include "ctype_local.h"
-#endif
 
 /* for cross host tools on older systems */
 #ifndef UINT32_C
diff -r 52f1ce5f39ac -r 9dbe1c20a5b2 usr.bin/mklocale/ldef.h
--- a/usr.bin/mklocale/ldef.h   Sat May 22 17:47:25 2010 +0000
+++ b/usr.bin/mklocale/ldef.h   Sat May 22 18:15:21 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ldef.h,v 1.7 2010/05/22 17:43:29 tnozaki Exp $ */
+/*     $NetBSD: ldef.h,v 1.8 2010/05/22 18:15:21 tnozaki Exp $ */
 
 /*-
  * Copyright (c) 1993
@@ -46,6 +46,6 @@
 } rune_list;
 
 typedef struct rune_map {
-    u_int32_t          map[1<<8];
+    u_int32_t          map[_CTYPE_CACHE_SIZE];
     rune_list          *root;
 } rune_map;