From 89c3520c8618c634507fd93551d0d0da9cf7e1a8 Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber@reactos.org>
Date: Sat, 26 Nov 2016 18:33:08 +0000
Subject: [PATCH] [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
---
 reactos/sdk/include/psdk/basetsd.h       | 4 +---
 reactos/sdk/include/psdk/windef.h        | 4 +---
 reactos/sdk/include/psdk/winsock.h       | 4 +---
 reactos/sdk/include/psdk/winsock2.h      | 4 +---
 reactos/sdk/include/xdk/winnt.template.h | 3 +--
 5 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/reactos/sdk/include/psdk/basetsd.h b/reactos/sdk/include/psdk/basetsd.h
index 2ac1e11afae..103560f6c25 100644
--- 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 15a7d6121d9..0166f3c8328 100644
--- 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 9c1e6121cb5..0d95be1e49e 100644
--- 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 77cb8733f45..3a58a3f1964 100644
--- 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 0ffbf219699..dd28aee4238 100644
--- 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