From 90ae79bfc00150488d16144ecdab15004d29f747 Mon Sep 17 00:00:00 2001 From: "KJK::Hyperion" Date: Fri, 7 Aug 2009 17:07:10 +0000 Subject: [PATCH] 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 --- reactos/include/psdk/windows.h | 2 +- reactos/include/psdk/winnt.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/include/psdk/windows.h b/reactos/include/psdk/windows.h index 65b1b505218..342239827a8 100644 --- a/reactos/include/psdk/windows.h +++ b/reactos/include/psdk/windows.h @@ -101,7 +101,7 @@ #endif #ifndef NOGDI #if !defined (__OBJC__) -#if (defined(__GNUC__) && (__GNUC__ >= 3)) || defined (__WATCOMC__) +#if (defined(__GNUC__) && (__GNUC__ >= 3)) || defined (__WATCOMC__) || defined(_MSC_VER) #include #endif #endif /* __OBJC__ */ diff --git a/reactos/include/psdk/winnt.h b/reactos/include/psdk/winnt.h index ab6c61f771f..056c860f71b 100644 --- a/reactos/include/psdk/winnt.h +++ b/reactos/include/psdk/winnt.h @@ -197,7 +197,7 @@ typedef WORD LANGID; #endif #undef __int64 #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 #endif /* __GNUC__/__WATCOMC */ #if defined(_HAVE_INT64) || (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64) @@ -2841,7 +2841,7 @@ typedef struct _CONTEXT { #ifndef PAGE_SIZE #define PAGE_SIZE 0x1000 // FIXME: This should probably go elsewhere #endif - + /* The following flags control the contents of the CONTEXT structure. */ #define CONTEXT_ARM 0x0000040