include: Make DWORD/LONG/ULONG an int to use the same type in Win32 and Win64.
This commit is contained in:
parent
85ce5117c5
commit
f8b8f216dd
|
@ -196,14 +196,14 @@ typedef int INT, *PINT, *LPINT;
|
||||||
typedef unsigned int UINT, *PUINT;
|
typedef unsigned int UINT, *PUINT;
|
||||||
typedef float FLOAT, *PFLOAT;
|
typedef float FLOAT, *PFLOAT;
|
||||||
typedef char *PSZ;
|
typedef char *PSZ;
|
||||||
#if defined(_WIN64) && !defined(_MSC_VER)
|
#if defined(_MSC_VER) || (defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64))
|
||||||
typedef int *LPLONG;
|
|
||||||
typedef unsigned int DWORD, *PDWORD, *LPDWORD;
|
|
||||||
typedef unsigned int ULONG, *PULONG;
|
|
||||||
#else
|
|
||||||
typedef long *LPLONG;
|
typedef long *LPLONG;
|
||||||
typedef unsigned long DWORD, *PDWORD, *LPDWORD;
|
typedef unsigned long DWORD, *PDWORD, *LPDWORD;
|
||||||
typedef unsigned long ULONG, *PULONG;
|
typedef unsigned long ULONG, *PULONG;
|
||||||
|
#else
|
||||||
|
typedef int *LPLONG;
|
||||||
|
typedef unsigned int DWORD, *PDWORD, *LPDWORD;
|
||||||
|
typedef unsigned int ULONG, *PULONG;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Macros to map Winelib names to the correct implementation name */
|
/* Macros to map Winelib names to the correct implementation name */
|
||||||
|
|
|
@ -318,10 +318,10 @@ typedef VOID *PVOID64;
|
||||||
typedef BYTE BOOLEAN, *PBOOLEAN;
|
typedef BYTE BOOLEAN, *PBOOLEAN;
|
||||||
typedef char CHAR, *PCHAR;
|
typedef char CHAR, *PCHAR;
|
||||||
typedef short SHORT, *PSHORT;
|
typedef short SHORT, *PSHORT;
|
||||||
#if defined(_WIN64) && !defined(_MSC_VER)
|
#if defined(_MSC_VER) || (defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64))
|
||||||
typedef int LONG, *PLONG;
|
|
||||||
#else
|
|
||||||
typedef long LONG, *PLONG;
|
typedef long LONG, *PLONG;
|
||||||
|
#else
|
||||||
|
typedef int LONG, *PLONG;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Some systems might have wchar_t, but we really need 16 bit characters */
|
/* Some systems might have wchar_t, but we really need 16 bit characters */
|
||||||
|
|
Loading…
Reference in New Issue