mirror of
https://github.com/reactos/reactos.git
synced 2024-09-06 10:52:52 +00:00
Fix the logic for the wchar_t checks.
We don't only need to check if wchar_t has already been defined, but also report this to all known hosts and operating systems. svn path=/trunk/; revision=28410
This commit is contained in:
parent
44840c6db3
commit
b92649d370
|
@ -50,23 +50,39 @@ extern "C" {
|
||||||
#include <basetsd.h>
|
#include <basetsd.h>
|
||||||
#include <guiddef.h>
|
#include <guiddef.h>
|
||||||
|
|
||||||
|
/* wchar_t checks
|
||||||
|
* First check if wchar_t has already been defined by any host/OS */
|
||||||
#ifndef _WCHAR_T_DEFINED
|
#ifndef _WCHAR_T_DEFINED
|
||||||
#define _WCHAR_T_DEFINED
|
|
||||||
#ifndef _WCHAR_T_DECLARED /* for FreeBSD 5 and later */
|
#ifndef _WCHAR_T_DECLARED /* for FreeBSD 5 and later */
|
||||||
#define _WCHAR_T_DECLARED
|
|
||||||
#ifndef _WCHAR_T /* for Mac OS X */
|
#ifndef _WCHAR_T /* for Mac OS X */
|
||||||
#define _WCHAR_T
|
|
||||||
#ifndef _WCHAR_T_
|
#ifndef _WCHAR_T_
|
||||||
#define _WCHAR_T_
|
|
||||||
#undef __need_wchar_t
|
#undef __need_wchar_t
|
||||||
#ifndef __cplusplus
|
#ifndef __cplusplus
|
||||||
typedef unsigned short wchar_t;
|
typedef unsigned short wchar_t;
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* Now report that it has been defined to all known hosts/operating systems */
|
||||||
|
#ifndef _WCHAR_T_DEFINED
|
||||||
|
#define _WCHAR_T_DEFINED
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef _WCHAR_T_DECLARED
|
||||||
|
#define _WCHAR_T_DECLARED
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef _WCHAR_T
|
||||||
|
#define _WCHAR_T
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef _WCHAR_T_
|
||||||
|
#define _WCHAR_T_
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <winerror.h>
|
#include <winerror.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
|
Loading…
Reference in a new issue