Date: Sun, 1 Jul 2012 02:57:30 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r237867 - in projects/arm_eabi: include sys/amd64/include sys/arm/include sys/i386/include sys/ia64/include sys/mips/include sys/pc98/include sys/powerpc/include sys/sparc64/include sys... Message-ID: <201207010257.q612vUHB060992@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Sun Jul 1 02:57:30 2012 New Revision: 237867 URL: http://svn.freebsd.org/changeset/base/237867 Log: Revert the wchar changes to simplify pulling in the changes in HEAD. Deleted: projects/arm_eabi/sys/amd64/include/_wchar.h projects/arm_eabi/sys/arm/include/_wchar.h projects/arm_eabi/sys/i386/include/_wchar.h projects/arm_eabi/sys/ia64/include/_wchar.h projects/arm_eabi/sys/mips/include/_wchar.h projects/arm_eabi/sys/pc98/include/_wchar.h projects/arm_eabi/sys/powerpc/include/_wchar.h projects/arm_eabi/sys/sparc64/include/_wchar.h projects/arm_eabi/sys/x86/include/_wchar.h Modified: projects/arm_eabi/include/wchar.h projects/arm_eabi/sys/arm/include/_stdint.h projects/arm_eabi/sys/arm/include/_types.h projects/arm_eabi/sys/ia64/include/_stdint.h projects/arm_eabi/sys/ia64/include/_types.h projects/arm_eabi/sys/mips/include/_stdint.h projects/arm_eabi/sys/mips/include/_types.h projects/arm_eabi/sys/powerpc/include/_stdint.h projects/arm_eabi/sys/powerpc/include/_types.h projects/arm_eabi/sys/sparc64/include/_stdint.h projects/arm_eabi/sys/sparc64/include/_types.h projects/arm_eabi/sys/sys/_types.h projects/arm_eabi/sys/x86/include/_stdint.h projects/arm_eabi/sys/x86/include/_types.h Modified: projects/arm_eabi/include/wchar.h ============================================================================== --- projects/arm_eabi/include/wchar.h Sun Jul 1 02:44:36 2012 (r237866) +++ projects/arm_eabi/include/wchar.h Sun Jul 1 02:57:30 2012 (r237867) @@ -64,7 +64,6 @@ #include <sys/_null.h> #include <sys/_types.h> #include <machine/_limits.h> -#include <machine/_wchar.h> #include <_ctype.h> #ifndef _MBSTATE_T_DECLARED @@ -89,6 +88,11 @@ typedef __wint_t wint_t; #define _WINT_T_DECLARED #endif +#ifndef WCHAR_MIN +#define WCHAR_MIN __INT_MIN +#define WCHAR_MAX __INT_MAX +#endif + #ifndef WEOF #define WEOF ((wint_t)-1) #endif Modified: projects/arm_eabi/sys/arm/include/_stdint.h ============================================================================== --- projects/arm_eabi/sys/arm/include/_stdint.h Sun Jul 1 02:44:36 2012 (r237866) +++ projects/arm_eabi/sys/arm/include/_stdint.h Sun Jul 1 02:57:30 2012 (r237867) @@ -52,8 +52,6 @@ #if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) -#include <machine/_wchar.h> - /* * ISO/IEC 9899:1999 * 7.18.2.1 Limits of exact-width integer types @@ -151,6 +149,12 @@ /* Limit of size_t. */ #define SIZE_MAX UINT32_MAX +#ifndef WCHAR_MIN /* Also possibly defined in <wchar.h> */ +/* Limits of wchar_t. */ +#define WCHAR_MIN INT32_MIN +#define WCHAR_MAX INT32_MAX +#endif + /* Limits of wint_t. */ #define WINT_MIN INT32_MIN #define WINT_MAX INT32_MAX Modified: projects/arm_eabi/sys/arm/include/_types.h ============================================================================== --- projects/arm_eabi/sys/arm/include/_types.h Sun Jul 1 02:44:36 2012 (r237866) +++ projects/arm_eabi/sys/arm/include/_types.h Sun Jul 1 02:57:30 2012 (r237867) @@ -119,10 +119,4 @@ typedef char * __va_list; typedef __va_list __gnuc_va_list; /* compatibility w/GNU headers*/ #endif -#ifdef __ARM_EABI__ -typedef unsigned int __wchar_t; -#else -typedef int __wchar_t; -#endif - #endif /* !_MACHINE__TYPES_H_ */ Modified: projects/arm_eabi/sys/ia64/include/_stdint.h ============================================================================== --- projects/arm_eabi/sys/ia64/include/_stdint.h Sun Jul 1 02:44:36 2012 (r237866) +++ projects/arm_eabi/sys/ia64/include/_stdint.h Sun Jul 1 02:57:30 2012 (r237867) @@ -52,8 +52,6 @@ #if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) -#include <machine/_wchar.h> - /* * ISO/IEC 9899:1999 * 7.18.2.1 Limits of exact-width integer types @@ -151,6 +149,12 @@ /* Limit of size_t. */ #define SIZE_MAX UINT64_MAX +#ifndef WCHAR_MIN /* Also possibly defined in <wchar.h> */ +/* Limits of wchar_t. */ +#define WCHAR_MIN INT32_MIN +#define WCHAR_MAX INT32_MAX +#endif + /* Limits of wint_t. */ #define WINT_MIN INT32_MIN #define WINT_MAX INT32_MAX Modified: projects/arm_eabi/sys/ia64/include/_types.h ============================================================================== --- projects/arm_eabi/sys/ia64/include/_types.h Sun Jul 1 02:44:36 2012 (r237866) +++ projects/arm_eabi/sys/ia64/include/_types.h Sun Jul 1 02:57:30 2012 (r237867) @@ -115,6 +115,4 @@ typedef char * __va_list; /* non-funct #endif /* lint */ #endif /* __GNUCLIKE_BUILTIN_VARARGS */ -typedef int __wchar_t; - #endif /* !_MACHINE__TYPES_H_ */ Modified: projects/arm_eabi/sys/mips/include/_stdint.h ============================================================================== --- projects/arm_eabi/sys/mips/include/_stdint.h Sun Jul 1 02:44:36 2012 (r237866) +++ projects/arm_eabi/sys/mips/include/_stdint.h Sun Jul 1 02:57:30 2012 (r237867) @@ -66,8 +66,6 @@ #if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) -#include <machine/_wchar.h> - #ifdef __mips_n64 #define __INT64_C(c) (c ## L) #define __UINT64_C(c) (c ## UL) @@ -188,6 +186,12 @@ #define SIG_ATOMIC_MIN INT32_MIN #define SIG_ATOMIC_MAX INT32_MAX +#ifndef WCHAR_MIN /* Also possibly defined in <wchar.h> */ +/* Limits of wchar_t. */ +#define WCHAR_MIN INT32_MIN +#define WCHAR_MAX INT32_MAX +#endif + /* Limits of wint_t. */ #define WINT_MIN INT32_MIN #define WINT_MAX INT32_MAX Modified: projects/arm_eabi/sys/mips/include/_types.h ============================================================================== --- projects/arm_eabi/sys/mips/include/_types.h Sun Jul 1 02:44:36 2012 (r237866) +++ projects/arm_eabi/sys/mips/include/_types.h Sun Jul 1 02:57:30 2012 (r237867) @@ -160,6 +160,4 @@ typedef char * __va_list; typedef __va_list __gnuc_va_list; /* compatibility w/GNU headers*/ #endif -typedef int __wchar_t; - #endif /* !_MACHINE__TYPES_H_ */ Modified: projects/arm_eabi/sys/powerpc/include/_stdint.h ============================================================================== --- projects/arm_eabi/sys/powerpc/include/_stdint.h Sun Jul 1 02:44:36 2012 (r237866) +++ projects/arm_eabi/sys/powerpc/include/_stdint.h Sun Jul 1 02:57:30 2012 (r237867) @@ -65,8 +65,6 @@ #if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) -#include <machine/_wchar.h> - #ifdef __LP64__ #define __INT64_C(c) (c ## L) #define __UINT64_C(c) (c ## UL) @@ -191,6 +189,12 @@ #define SIZE_MAX UINT32_MAX #endif +#ifndef WCHAR_MIN /* Also possibly defined in <wchar.h> */ +/* Limits of wchar_t. */ +#define WCHAR_MIN INT32_MIN +#define WCHAR_MAX INT32_MAX +#endif + /* Limits of wint_t. */ #define WINT_MIN INT32_MIN #define WINT_MAX INT32_MAX Modified: projects/arm_eabi/sys/powerpc/include/_types.h ============================================================================== --- projects/arm_eabi/sys/powerpc/include/_types.h Sun Jul 1 02:44:36 2012 (r237866) +++ projects/arm_eabi/sys/powerpc/include/_types.h Sun Jul 1 02:57:30 2012 (r237867) @@ -154,6 +154,4 @@ typedef struct { typedef __va_list __gnuc_va_list; /* compatibility w/GNU headers*/ #endif -typedef int __wchar_t; - #endif /* !_MACHINE__TYPES_H_ */ Modified: projects/arm_eabi/sys/sparc64/include/_stdint.h ============================================================================== --- projects/arm_eabi/sys/sparc64/include/_stdint.h Sun Jul 1 02:44:36 2012 (r237866) +++ projects/arm_eabi/sys/sparc64/include/_stdint.h Sun Jul 1 02:57:30 2012 (r237867) @@ -52,8 +52,6 @@ #if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) -#include <machine/_wchar.h> - /* * ISO/IEC 9899:1999 * 7.18.2.1 Limits of exact-width integer types @@ -151,6 +149,12 @@ /* Limit of size_t. */ #define SIZE_MAX UINT64_MAX +#ifndef WCHAR_MIN /* Also possibly defined in <wchar.h> */ +/* Limits of wchar_t. */ +#define WCHAR_MIN INT32_MIN +#define WCHAR_MAX INT32_MAX +#endif + /* Limits of wint_t. */ #define WINT_MIN INT32_MIN #define WINT_MAX INT32_MAX Modified: projects/arm_eabi/sys/sparc64/include/_types.h ============================================================================== --- projects/arm_eabi/sys/sparc64/include/_types.h Sun Jul 1 02:44:36 2012 (r237866) +++ projects/arm_eabi/sys/sparc64/include/_types.h Sun Jul 1 02:57:30 2012 (r237867) @@ -107,6 +107,4 @@ typedef char * __va_list; typedef __va_list __gnuc_va_list; /* compatibility w/GNU headers*/ #endif -typedef int __wchar_t; - #endif /* !_MACHINE__TYPES_H_ */ Modified: projects/arm_eabi/sys/sys/_types.h ============================================================================== --- projects/arm_eabi/sys/sys/_types.h Sun Jul 1 02:44:36 2012 (r237866) +++ projects/arm_eabi/sys/sys/_types.h Sun Jul 1 02:57:30 2012 (r237867) @@ -87,6 +87,7 @@ typedef int __cpusetid_t; /* cpuset ide */ typedef int __ct_rune_t; /* arg type for ctype funcs */ typedef __ct_rune_t __rune_t; /* rune_t (see above) */ +typedef __ct_rune_t __wchar_t; /* wchar_t (see above) */ typedef __ct_rune_t __wint_t; /* wint_t (see above) */ typedef __uint32_t __dev_t; /* device number */ Modified: projects/arm_eabi/sys/x86/include/_stdint.h ============================================================================== --- projects/arm_eabi/sys/x86/include/_stdint.h Sun Jul 1 02:44:36 2012 (r237866) +++ projects/arm_eabi/sys/x86/include/_stdint.h Sun Jul 1 02:57:30 2012 (r237867) @@ -65,8 +65,6 @@ #if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) -#include <machine/_wchar.h> - /* * ISO/IEC 9899:1999 * 7.18.2.1 Limits of exact-width integer types @@ -182,6 +180,12 @@ #define SIZE_MAX UINT32_MAX #endif +#ifndef WCHAR_MIN /* Also possibly defined in <wchar.h> */ +/* Limits of wchar_t. */ +#define WCHAR_MIN INT32_MIN +#define WCHAR_MAX INT32_MAX +#endif + /* Limits of wint_t. */ #define WINT_MIN INT32_MIN #define WINT_MAX INT32_MAX Modified: projects/arm_eabi/sys/x86/include/_types.h ============================================================================== --- projects/arm_eabi/sys/x86/include/_types.h Sun Jul 1 02:44:36 2012 (r237866) +++ projects/arm_eabi/sys/x86/include/_types.h Sun Jul 1 02:57:30 2012 (r237867) @@ -157,6 +157,4 @@ typedef char * __va_list; /* pretend * typedef __va_list __gnuc_va_list; /* compatibility w/GNU headers*/ #endif -typedef int __wchar_t; - #endif /* !_MACHINE__TYPES_H_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207010257.q612vUHB060992>