Author: cfinck Date: Sat Aug 18 23:49:53 2007 New Revision: 28409
URL: http://svn.reactos.org/svn/reactos?rev=28409&view=rev Log: Move the wchar_t check above the "#include <ctype.h>" line (this is needed for Mac OS X host compatibility)
Modified: trunk/reactos/include/psdk/winnt.h
Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=28... ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Sat Aug 18 23:49:53 2007 @@ -49,6 +49,23 @@
#include <basetsd.h> #include <guiddef.h> + +#ifndef _WCHAR_T_DEFINED +#define _WCHAR_T_DEFINED +#ifndef _WCHAR_T_DECLARED /* for FreeBSD 5 and later */ +#define _WCHAR_T_DECLARED +#ifndef _WCHAR_T /* for Mac OS X */ +#define _WCHAR_T +#ifndef _WCHAR_T_ +#define _WCHAR_T_ +#undef __need_wchar_t +#ifndef __cplusplus +typedef unsigned short wchar_t; +#endif +#endif +#endif +#endif +#endif
#include <ctype.h> #include <winerror.h> @@ -117,23 +134,6 @@ #define __ptr64 #endif typedef void* __ptr64 PVOID64; - -#ifndef _WCHAR_T_DEFINED -#define _WCHAR_T_DEFINED -#ifndef _WCHAR_T_DECLARED /* for FreeBSD 5 and later */ -#define _WCHAR_T_DECLARED -#ifndef _WCHAR_T /* for Mac OS X */ -#define _WCHAR_T -#ifndef _WCHAR_T_ -#define _WCHAR_T_ -#undef __need_wchar_t -#ifndef __cplusplus -typedef unsigned short wchar_t; -#endif -#endif -#endif -#endif -#endif
#ifdef __cplusplus # define EXTERN_C extern "C"