summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authortnozaki <tnozaki@NetBSD.org>2010-05-22 13:50:02 +0000
committertnozaki <tnozaki@NetBSD.org>2010-05-22 13:50:02 +0000
commitb18f206e588169bca7490ebd1604a8f1bb4cb288 (patch)
tree97efa69825120f48d113094764af47fae60ac94b /lib
parentbbed57c2e025a0d844f94926cc5724c1905a0ace (diff)
move __mb_len_max_runtime from rune_local.h -> setlocale_local.h.
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/locale/rune_local.h5
-rw-r--r--lib/libc/locale/setlocale1.c6
-rw-r--r--lib/libc/locale/setlocale32.c6
-rw-r--r--lib/libc/locale/setlocale_local.h5
4 files changed, 13 insertions, 9 deletions
diff --git a/lib/libc/locale/rune_local.h b/lib/libc/locale/rune_local.h
index c10c804fd07..c9acf955f54 100644
--- a/lib/libc/locale/rune_local.h
+++ b/lib/libc/locale/rune_local.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rune_local.h,v 1.13 2010/05/22 07:18:43 tnozaki Exp $ */
+/* $NetBSD: rune_local.h,v 1.14 2010/05/22 13:50:02 tnozaki Exp $ */
/*-
* Copyright (c) 2000 Citrus Project,
@@ -111,9 +111,6 @@
/*
* global variables
*/
-extern size_t __mb_len_max_runtime;
-#define __MB_LEN_MAX_RUNTIME __mb_len_max_runtime
-
extern const _RuneLocale _DefaultRuneLocale;
extern const _RuneLocale *_CurrentRuneLocale;
diff --git a/lib/libc/locale/setlocale1.c b/lib/libc/locale/setlocale1.c
index 2149f25bbd2..5ed9f9f5e7d 100644
--- a/lib/libc/locale/setlocale1.c
+++ b/lib/libc/locale/setlocale1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: setlocale1.c,v 1.3 2010/05/22 07:18:43 tnozaki Exp $ */
+/* $NetBSD: setlocale1.c,v 1.4 2010/05/22 13:50:02 tnozaki Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@@ -28,12 +28,14 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: setlocale1.c,v 1.3 2010/05/22 07:18:43 tnozaki Exp $");
+__RCSID("$NetBSD: setlocale1.c,v 1.4 2010/05/22 13:50:02 tnozaki Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
+#include <sys/types.h>
#define __SETLOCALE_SOURCE__
#include <locale.h>
+#include "setlocale_local.h"
#include "rune_local.h"
__warn_references(setlocale,
diff --git a/lib/libc/locale/setlocale32.c b/lib/libc/locale/setlocale32.c
index 99f53e0b195..605c3e9272e 100644
--- a/lib/libc/locale/setlocale32.c
+++ b/lib/libc/locale/setlocale32.c
@@ -1,4 +1,4 @@
-/* $NetBSD: setlocale32.c,v 1.5 2010/05/22 07:18:43 tnozaki Exp $ */
+/* $NetBSD: setlocale32.c,v 1.6 2010/05/22 13:50:02 tnozaki Exp $ */
/*-
* Copyright (c)1999 Citrus Project,
@@ -28,13 +28,15 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: setlocale32.c,v 1.5 2010/05/22 07:18:43 tnozaki Exp $");
+__RCSID("$NetBSD: setlocale32.c,v 1.6 2010/05/22 13:50:02 tnozaki Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
+#include <sys/types.h>
#define __SETLOCALE_SOURCE__
#include <locale.h>
#include <limits.h>
+#include "setlocale_local.h"
#include "rune_local.h"
char *
diff --git a/lib/libc/locale/setlocale_local.h b/lib/libc/locale/setlocale_local.h
index c705287987d..d26a3e99bc4 100644
--- a/lib/libc/locale/setlocale_local.h
+++ b/lib/libc/locale/setlocale_local.h
@@ -1,4 +1,4 @@
-/* $NetBSD: setlocale_local.h,v 1.5 2010/05/22 13:15:59 tnozaki Exp $ */
+/* $NetBSD: setlocale_local.h,v 1.6 2010/05/22 13:50:02 tnozaki Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -77,4 +77,7 @@ _current_cache(void)
return (*_current_locale())->cache;
}
+extern size_t __mb_len_max_runtime;
+#define __MB_LEN_MAX_RUNTIME __mb_len_max_runtime
+
#endif /*_SETLOCALE_LOCAL_H_*/