Module Name: src
Committed By: tnozaki
Date: Sat May 22 18:15:21 UTC 2010
Modified Files:
src/lib/libc/locale: ctype_local.h runetype_local.h
src/usr.bin/mklocale: ldef.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/locale/ctype_local.h
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/locale/runetype_local.h
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/mklocale/ldef.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/locale/ctype_local.h
diff -u src/lib/libc/locale/ctype_local.h:1.1 src/lib/libc/locale/ctype_local.h:1.2
--- src/lib/libc/locale/ctype_local.h:1.1 Sat May 22 06:38:15 2010
+++ src/lib/libc/locale/ctype_local.h Sat May 22 18:15:21 2010
@@ -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)
Index: src/lib/libc/locale/runetype_local.h
diff -u src/lib/libc/locale/runetype_local.h:1.7 src/lib/libc/locale/runetype_local.h:1.8
--- src/lib/libc/locale/runetype_local.h:1.7 Sat May 22 17:47:25 2010
+++ src/lib/libc/locale/runetype_local.h Sat May 22 18:15:21 2010
@@ -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
Index: src/usr.bin/mklocale/ldef.h
diff -u src/usr.bin/mklocale/ldef.h:1.7 src/usr.bin/mklocale/ldef.h:1.8
--- src/usr.bin/mklocale/ldef.h:1.7 Sat May 22 17:43:29 2010
+++ src/usr.bin/mklocale/ldef.h Sat May 22 18:15:21 2010
@@ -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;
