summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authortnozaki <tnozaki@NetBSD.org>2010-06-07 13:52:28 +0000
committertnozaki <tnozaki@NetBSD.org>2010-06-07 13:52:28 +0000
commit9efec5bce3da05aa74c710deaa180d73b2f1ab11 (patch)
tree5c3668228f653ec862cbe9d2adf754afd6aacb05 /include
parent505728c6b8eb8b35ebee032595aed52e789a03bd (diff)
1. MB_LEN_MAX switch MD to MI.
2. unfortunately hppa's MB_LEN_MAX is defined incorrectly 6 instead of 32 so we have to add more setlocale(3) __RENAME func, __setlocale50. 3. move setlocale1.c and setlocale32.c to lib/libc/compat/locale/* prepareing for next libc major crunk. 4. bump libc minor version.
Diffstat (limited to 'include')
-rw-r--r--include/limits.h4
-rw-r--r--include/locale.h12
2 files changed, 6 insertions, 10 deletions
diff --git a/include/limits.h b/include/limits.h
index 077a9a9f03c..dd633b1526c 100644
--- a/include/limits.h
+++ b/include/limits.h
@@ -1,4 +1,4 @@
-/* $NetBSD: limits.h,v 1.28 2008/08/27 08:53:55 christos Exp $ */
+/* $NetBSD: limits.h,v 1.29 2010/06/07 13:52:29 tnozaki Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -108,6 +108,8 @@
#endif /* _POSIX_C_SOURCE || _XOPEN_SOURCE || _NETBSD_SOURCE */
+#define MB_LEN_MAX 32 /* Allow ISO/IEC 2022 */
+
#include <machine/limits.h>
#include <sys/syslimits.h>
diff --git a/include/locale.h b/include/locale.h
index 5f956d6ab2a..59c68792adc 100644
--- a/include/locale.h
+++ b/include/locale.h
@@ -1,4 +1,4 @@
-/* $NetBSD: locale.h,v 1.16 2009/01/11 03:04:12 christos Exp $ */
+/* $NetBSD: locale.h,v 1.17 2010/06/07 13:52:29 tnozaki Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -84,14 +84,8 @@ typedef struct _locale_impl_t *_locale_t;
#endif
__BEGIN_DECLS
-struct lconv *localeconv(void);
-#ifdef __SETLOCALE_SOURCE__
-char *setlocale(int, const char *);
-char *__setlocale_mb_len_max_32(int, const char *);
-char *__setlocale(int, const char *);
-#else /* !__SETLOCALE_SOURCE__ */
-char *setlocale(int, const char *) __RENAME(__setlocale_mb_len_max_32);
-#endif /* !__SETLOCALE_SOURCE__ */
+struct lconv *localeconv(void);
+char *setlocale(int, const char *) __RENAME(__setlocale50);
__END_DECLS
#endif /* _LOCALE_H_ */