mirror of
https://github.com/reactos/reactos.git
synced 2024-09-29 22:16:01 +00:00
modified include/psdk/windows.h
modified include/psdk/winnt.h Visual C++ needs love, too. Extend conditional w32api code for Watcom C to Visual C++ svn path=/trunk/; revision=42472
This commit is contained in:
parent
578de69cda
commit
90ae79bfc0
|
@ -101,7 +101,7 @@
|
||||||
#endif
|
#endif
|
||||||
#ifndef NOGDI
|
#ifndef NOGDI
|
||||||
#if !defined (__OBJC__)
|
#if !defined (__OBJC__)
|
||||||
#if (defined(__GNUC__) && (__GNUC__ >= 3)) || defined (__WATCOMC__)
|
#if (defined(__GNUC__) && (__GNUC__ >= 3)) || defined (__WATCOMC__) || defined(_MSC_VER)
|
||||||
#include <ole2.h>
|
#include <ole2.h>
|
||||||
#endif
|
#endif
|
||||||
#endif /* __OBJC__ */
|
#endif /* __OBJC__ */
|
||||||
|
|
|
@ -197,7 +197,7 @@ typedef WORD LANGID;
|
||||||
#endif
|
#endif
|
||||||
#undef __int64
|
#undef __int64
|
||||||
#define __int64 long long
|
#define __int64 long long
|
||||||
#elif defined(__WATCOMC__) && (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64 )
|
#elif (defined(__WATCOMC__) || defined(_MSC_VER)) && (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64 )
|
||||||
#define _HAVE_INT64
|
#define _HAVE_INT64
|
||||||
#endif /* __GNUC__/__WATCOMC */
|
#endif /* __GNUC__/__WATCOMC */
|
||||||
#if defined(_HAVE_INT64) || (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64)
|
#if defined(_HAVE_INT64) || (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64)
|
||||||
|
@ -2841,7 +2841,7 @@ typedef struct _CONTEXT {
|
||||||
#ifndef PAGE_SIZE
|
#ifndef PAGE_SIZE
|
||||||
#define PAGE_SIZE 0x1000 // FIXME: This should probably go elsewhere
|
#define PAGE_SIZE 0x1000 // FIXME: This should probably go elsewhere
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* The following flags control the contents of the CONTEXT structure. */
|
/* The following flags control the contents of the CONTEXT structure. */
|
||||||
|
|
||||||
#define CONTEXT_ARM 0x0000040
|
#define CONTEXT_ARM 0x0000040
|
||||||
|
|
Loading…
Reference in a new issue