Author: hyperion
Date: Fri Aug 7 19:07:10 2009
New Revision: 42472
URL: http://svn.reactos.org/svn/reactos?rev=42472&view=rev
Log:
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++
Modified:
trunk/reactos/include/psdk/windows.h
trunk/reactos/include/psdk/winnt.h
Modified: trunk/reactos/include/psdk/windows.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windows.h?rev=42472&r1=42471&r2=42472&view=diff
==============================================================================
--- trunk/reactos/include/psdk/windows.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/windows.h [iso-8859-1] Fri Aug 7 19:07:10 2009
@@ -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 <ole2.h>
#endif
#endif /* __OBJC__ */
Modified: trunk/reactos/include/psdk/winnt.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=42472&r1=42471&r2=42472&view=diff
==============================================================================
--- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Fri Aug 7 19:07:10 2009
@@ -197,7 +197,7 @@
#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 @@
#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
