include: Make DWORD/LONG/ULONG an int to use the same type in Win32 and Win64.
diff --git a/include/windef.h b/include/windef.h
index 850c026..c328fb4 100644
--- a/include/windef.h
+++ b/include/windef.h
@@ -196,14 +196,14 @@
typedef unsigned int UINT, *PUINT;
typedef float FLOAT, *PFLOAT;
typedef char *PSZ;
-#if defined(_WIN64) && !defined(_MSC_VER)
-typedef int *LPLONG;
-typedef unsigned int DWORD, *PDWORD, *LPDWORD;
-typedef unsigned int ULONG, *PULONG;
-#else
+#if defined(_MSC_VER) || (defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64))
typedef long *LPLONG;
typedef unsigned long DWORD, *PDWORD, *LPDWORD;
typedef unsigned long ULONG, *PULONG;
+#else
+typedef int *LPLONG;
+typedef unsigned int DWORD, *PDWORD, *LPDWORD;
+typedef unsigned int ULONG, *PULONG;
#endif
/* Macros to map Winelib names to the correct implementation name */
diff --git a/include/winnt.h b/include/winnt.h
index 119e0be..c067c5c 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -318,10 +318,10 @@
typedef BYTE BOOLEAN, *PBOOLEAN;
typedef char CHAR, *PCHAR;
typedef short SHORT, *PSHORT;
-#if defined(_WIN64) && !defined(_MSC_VER)
-typedef int LONG, *PLONG;
-#else
+#if defined(_MSC_VER) || (defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64))
typedef long LONG, *PLONG;
+#else
+typedef int LONG, *PLONG;
#endif
/* Some systems might have wchar_t, but we really need 16 bit characters */
