[ros-diffs] [tfaber] 73383: [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 Zimmerm...

Author: tfaber
Date: Sat Nov 26 18:33:08 2016
New Revision: 73383

URL: http://svn.reactos.org/svn/reactos?rev=73383&view=rev
Log:
[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.

Modified:
    trunk/reactos/sdk/include/psdk/basetsd.h
    trunk/reactos/sdk/include/psdk/windef.h
    trunk/reactos/sdk/include/psdk/winsock.h
    trunk/reactos/sdk/include/psdk/winsock2.h
    trunk/reactos/sdk/include/xdk/winnt.template.h

Modified: trunk/reactos/sdk/include/psdk/basetsd.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/basetsd.h…
==============================================================================
--- trunk/reactos/sdk/include/psdk/basetsd.h	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/psdk/basetsd.h	[iso-8859-1] Sat Nov 26 18:33:08 2016
@@ -6,11 +6,9 @@
 #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
 

Modified: trunk/reactos/sdk/include/psdk/windef.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/windef.h?…
==============================================================================
--- trunk/reactos/sdk/include/psdk/windef.h	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/psdk/windef.h	[iso-8859-1] Sat Nov 26 18:33:08 2016
@@ -14,11 +14,9 @@
 #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
 

Modified: trunk/reactos/sdk/include/psdk/winsock.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winsock.h…
==============================================================================
--- trunk/reactos/sdk/include/psdk/winsock.h	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/psdk/winsock.h	[iso-8859-1] Sat Nov 26 18:33:08 2016
@@ -15,11 +15,9 @@
 #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
 

Modified: trunk/reactos/sdk/include/psdk/winsock2.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winsock2.…
==============================================================================
--- trunk/reactos/sdk/include/psdk/winsock2.h	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/psdk/winsock2.h	[iso-8859-1] Sat Nov 26 18:33:08 2016
@@ -39,11 +39,9 @@
 #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
 

Modified: trunk/reactos/sdk/include/xdk/winnt.template.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/xdk/winnt.temp…
==============================================================================
--- trunk/reactos/sdk/include/xdk/winnt.template.h	[iso-8859-1] (original)
+++ trunk/reactos/sdk/include/xdk/winnt.template.h	[iso-8859-1] Sat Nov 26 18:33:08 2016
@@ -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