[sginsberg] 37529: - LANG_WELSH and LANG_BRETON are present in newer official winnt.h (and our winnt.h), so no need to put hacked-up versions of them in "Wine compatibility" winnt.h. - Don't define wchar_t in winnt.h (kudos to Colin Finck for this fix) - Remove system_header
Author: sginsberg Date: Fri Nov 21 15:27:30 2008 New Revision: 37529
URL: http://svn.reactos.org/svn/reactos?rev=37529&view=rev Log: - LANG_WELSH and LANG_BRETON are present in newer official winnt.h (and our winnt.h), so no need to put hacked-up versions of them in "Wine compatibility" winnt.h. - Don't define wchar_t in winnt.h (kudos to Colin Finck for this fix) - Remove system_header
Modified: trunk/reactos/include/psdk/winnt.h trunk/reactos/include/reactos/wine/winnt.h
Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=37... ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Fri Nov 21 15:27:30 2008 @@ -1,8 +1,5 @@ #ifndef _WINNT_H #define _WINNT_H -#if __GNUC__ >= 3 -#pragma GCC system_header -#endif
#ifdef __GNUC__ #include <msvctarget.h> @@ -40,10 +37,6 @@
#include <basetsd.h> #include <guiddef.h> - -#ifndef __cplusplus - typedef unsigned short wchar_t; -#endif
#include <ctype.h> #undef __need_wchar_t
Modified: trunk/reactos/include/reactos/wine/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winnt.... ============================================================================== --- trunk/reactos/include/reactos/wine/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winnt.h [iso-8859-1] Fri Nov 21 15:27:30 2008 @@ -33,8 +33,6 @@ #define LANG_ESPERANTO 0x8f #define LANG_WALON 0x90 #define LANG_CORNISH 0x91 -#define LANG_WELSH 0x92 -#define LANG_BRETON 0x93
/* FIXME: these are not in the Windows header */ #define LANG_GAELIC 0x94
-
sginsberg＠svn.reactos.org