[PSDK][XDK]

- Automatically define __ROS_LONG64__ on LP64 systems. This makes no difference for ROS but makes things easier for downstream users of our headers.
 Patch by Cat Zimmermann.

svn path=/trunk/; revision=73383

diff --git a/reactos/sdk/include/psdk/basetsd.h b/reactos/sdk/include/psdk/basetsd.h
index 2ac1e11..103560f 100644 (file)
--- a/reactos/sdk/include/psdk/basetsd.h
+++ b/reactos/sdk/include/psdk/basetsd.h
@@ -6,13 +6,11 @@
 #include <msvctarget.h>
 #endif
 
-#ifndef _M_AMD64
+#if defined(__LP64__) || (!defined(_M_AMD64) && defined(__WINESRC__))
 #if !defined(__ROS_LONG64__)
-#ifdef __WINESRC__
 #define __ROS_LONG64__
 #endif
 #endif
-#endif
 
 #ifdef __GNUC__
 #ifndef __int64

diff --git a/reactos/sdk/include/psdk/windef.h b/reactos/sdk/include/psdk/windef.h
index 15a7d61..0166f3c 100644 (file)
--- a/reactos/sdk/include/psdk/windef.h
+++ b/reactos/sdk/include/psdk/windef.h
@@ -14,13 +14,11 @@
 #pragma warning(disable:4255)
 #endif
 
-#ifndef _M_AMD64
+#if defined(__LP64__) || (!defined(_M_AMD64) && defined(__WINESRC__))
 #if !defined(__ROS_LONG64__)
-#ifdef __WINESRC__
 #define __ROS_LONG64__
 #endif
 #endif
-#endif
 
 #ifndef NO_STRICT
 #ifndef STRICT

diff --git a/reactos/sdk/include/psdk/winsock.h b/reactos/sdk/include/psdk/winsock.h
index 9c1e612..0d95be1 100644 (file)
--- a/reactos/sdk/include/psdk/winsock.h
+++ b/reactos/sdk/include/psdk/winsock.h
@@ -15,13 +15,11 @@
 #include <windows.h>
 #endif
 
-#ifndef _M_AMD64
+#if defined(__LP64__) || (!defined(_M_AMD64) && defined(__WINESRC__))
 #if !defined(__ROS_LONG64__)
-#ifdef __WINESRC__
 #define __ROS_LONG64__
 #endif
 #endif
-#endif
 
 #define _GNU_H_WINDOWS32_SOCKETS
 

diff --git a/reactos/sdk/include/psdk/winsock2.h b/reactos/sdk/include/psdk/winsock2.h
index 77cb873..3a58a3f 100644 (file)
--- a/reactos/sdk/include/psdk/winsock2.h
+++ b/reactos/sdk/include/psdk/winsock2.h
@@ -39,13 +39,11 @@
 #endif
 #endif
 
-#ifndef _M_AMD64
+#if defined(__LP64__) || (!defined(_M_AMD64) && defined(__WINESRC__))
 #if !defined(__ROS_LONG64__)
-#ifdef __WINESRC__
 #define __ROS_LONG64__
 #endif
 #endif
-#endif
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/reactos/sdk/include/xdk/winnt.template.h b/reactos/sdk/include/xdk/winnt.template.h
index 0ffbf21..dd28aee 100644 (file)
--- a/reactos/sdk/include/xdk/winnt.template.h
+++ b/reactos/sdk/include/xdk/winnt.template.h
@@ -28,9 +28,8 @@
 #error Compiler too old!
 #endif
 
-/* HACK for wine code */
+#if defined(__LP64__) || (!defined(_M_AMD64) && defined(__WINESRC__))
 #if !defined(__ROS_LONG64__)
-#ifdef __WINESRC__
 #define __ROS_LONG64__
 #endif
 #endif