Jacek Caban : include: Introduce WINE_USE_LONG macro.
Alexandre Julliard
julliard at winehq.org
Mon May 4 15:49:17 CDT 2020
Module: wine
Branch: master
Commit: 0a09fdfa1fa82502921e48c4f4f7275b6ed2479e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a09fdfa1fa82502921e48c4f4f7275b6ed2479e
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon May 4 16:25:36 2020 +0200
include: Introduce WINE_USE_LONG macro.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
include/guiddef.h | 2 +-
include/ntdef.h | 2 +-
include/windef.h | 4 ++--
include/winnt.h | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/guiddef.h b/include/guiddef.h
index 1871910efa..546c450043 100644
--- a/include/guiddef.h
+++ b/include/guiddef.h
@@ -30,7 +30,7 @@ typedef struct
#else
typedef struct _GUID
{
-#ifdef _MSC_VER
+#ifdef WINE_USE_LONG
unsigned long Data1;
#else
unsigned int Data1;
diff --git a/include/ntdef.h b/include/ntdef.h
index d85aa6feb5..069e86575b 100644
--- a/include/ntdef.h
+++ b/include/ntdef.h
@@ -53,7 +53,7 @@ typedef enum _WAIT_TYPE {
#define BASETYPES
typedef unsigned char UCHAR, *PUCHAR;
typedef unsigned short USHORT, *PUSHORT;
-#ifdef _MSC_VER
+#ifdef WINE_USE_LONG
typedef unsigned long ULONG, *PULONG;
#else
typedef unsigned int ULONG, *PULONG;
diff --git a/include/windef.h b/include/windef.h
index 436ac6afd8..7ece7c8628 100644
--- a/include/windef.h
+++ b/include/windef.h
@@ -241,7 +241,7 @@ extern "C" {
#define BASETYPES
typedef unsigned char UCHAR, *PUCHAR;
typedef unsigned short USHORT, *PUSHORT;
-#ifdef _MSC_VER
+#ifdef WINE_USE_LONG
typedef unsigned long ULONG, *PULONG;
#else
typedef unsigned int ULONG, *PULONG;
@@ -257,7 +257,7 @@ typedef int INT, *PINT, *LPINT;
typedef unsigned int UINT, *PUINT;
typedef float FLOAT, *PFLOAT;
typedef char *PSZ;
-#ifdef _MSC_VER
+#ifdef WINE_USE_LONG
typedef long *LPLONG;
typedef unsigned long DWORD, *PDWORD, *LPDWORD;
#else
diff --git a/include/winnt.h b/include/winnt.h
index 883794cde8..cc2099086d 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -452,7 +452,7 @@ typedef VOID *PVOID64;
typedef BYTE BOOLEAN, *PBOOLEAN;
typedef char CHAR, *PCHAR;
typedef short SHORT, *PSHORT;
-#ifdef _MSC_VER
+#ifdef WINE_USE_LONG
typedef long LONG, *PLONG;
#else
typedef int LONG, *PLONG;
More information about the wine-cvs
mailing list