Module Name: src
Committed By: tnozaki
Date: Sat May 22 13:50:02 UTC 2010
Modified Files:
src/lib/libc/locale: rune_local.h setlocale1.c setlocale32.c
setlocale_local.h
Log Message:
move __mb_len_max_runtime from rune_local.h -> setlocale_local.h.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/locale/rune_local.h
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/locale/setlocale1.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/locale/setlocale32.c \
src/lib/libc/locale/setlocale_local.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/rune_local.h
diff -u src/lib/libc/locale/rune_local.h:1.13 src/lib/libc/locale/rune_local.h:1.14
--- src/lib/libc/locale/rune_local.h:1.13 Sat May 22 07:18:43 2010
+++ src/lib/libc/locale/rune_local.h Sat May 22 13:50:02 2010
@@ -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;
Index: src/lib/libc/locale/setlocale1.c
diff -u src/lib/libc/locale/setlocale1.c:1.3 src/lib/libc/locale/setlocale1.c:1.4
--- src/lib/libc/locale/setlocale1.c:1.3 Sat May 22 07:18:43 2010
+++ src/lib/libc/locale/setlocale1.c Sat May 22 13:50:02 2010
@@ -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,
Index: src/lib/libc/locale/setlocale32.c
diff -u src/lib/libc/locale/setlocale32.c:1.5 src/lib/libc/locale/setlocale32.c:1.6
--- src/lib/libc/locale/setlocale32.c:1.5 Sat May 22 07:18:43 2010
+++ src/lib/libc/locale/setlocale32.c Sat May 22 13:50:02 2010
@@ -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 *
Index: src/lib/libc/locale/setlocale_local.h
diff -u src/lib/libc/locale/setlocale_local.h:1.5 src/lib/libc/locale/setlocale_local.h:1.6
--- src/lib/libc/locale/setlocale_local.h:1.5 Sat May 22 13:15:59 2010
+++ src/lib/libc/locale/setlocale_local.h Sat May 22 13:50:02 2010
@@ -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 @@
return (*_current_locale())->cache;
}
+extern size_t __mb_len_max_runtime;
+#define __MB_LEN_MAX_RUNTIME __mb_len_max_runtime
+
#endif /*_SETLOCALE_LOCAL_H_*/
