Conditionally add DECLSPEC_ALIGN(8) to wine's 64-bit types and leave
the modifier off when compiling with msvc.
This commit is contained in:
parent
87844214ab
commit
ee8479596a
|
@ -73,17 +73,26 @@ extern "C" {
|
||||||
typedef signed char INT8, *PINT8;
|
typedef signed char INT8, *PINT8;
|
||||||
typedef signed short INT16, *PINT16;
|
typedef signed short INT16, *PINT16;
|
||||||
typedef signed int INT32, *PINT32;
|
typedef signed int INT32, *PINT32;
|
||||||
typedef signed __int64 DECLSPEC_ALIGN(8) INT64, *PINT64;
|
|
||||||
typedef unsigned char UINT8, *PUINT8;
|
typedef unsigned char UINT8, *PUINT8;
|
||||||
typedef unsigned short UINT16, *PUINT16;
|
typedef unsigned short UINT16, *PUINT16;
|
||||||
typedef unsigned int UINT32, *PUINT32;
|
typedef unsigned int UINT32, *PUINT32;
|
||||||
typedef unsigned __int64 DECLSPEC_ALIGN(8) UINT64, *PUINT64;
|
|
||||||
typedef signed int LONG32, *PLONG32;
|
typedef signed int LONG32, *PLONG32;
|
||||||
typedef unsigned int ULONG32, *PULONG32;
|
typedef unsigned int ULONG32, *PULONG32;
|
||||||
typedef unsigned int DWORD32, *PDWORD32;
|
typedef unsigned int DWORD32, *PDWORD32;
|
||||||
|
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
typedef signed __int64 INT64, *PINT64;
|
||||||
|
typedef unsigned __int64 UINT64, *PUINT64;
|
||||||
|
typedef signed __int64 LONG64, *PLONG64;
|
||||||
|
typedef unsigned __int64 ULONG64, *PULONG64;
|
||||||
|
typedef unsigned __int64 DWORD64, *PDWORD64;
|
||||||
|
#else
|
||||||
|
typedef signed __int64 DECLSPEC_ALIGN(8) INT64, *PINT64;
|
||||||
|
typedef unsigned __int64 DECLSPEC_ALIGN(8) UINT64, *PUINT64;
|
||||||
typedef signed __int64 DECLSPEC_ALIGN(8) LONG64, *PLONG64;
|
typedef signed __int64 DECLSPEC_ALIGN(8) LONG64, *PLONG64;
|
||||||
typedef unsigned __int64 DECLSPEC_ALIGN(8) ULONG64, *PULONG64;
|
typedef unsigned __int64 DECLSPEC_ALIGN(8) ULONG64, *PULONG64;
|
||||||
typedef unsigned __int64 DECLSPEC_ALIGN(8) DWORD64, *PDWORD64;
|
typedef unsigned __int64 DECLSPEC_ALIGN(8) DWORD64, *PDWORD64;
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Win32 or Win64 dependent typedef/defines. */
|
/* Win32 or Win64 dependent typedef/defines. */
|
||||||
|
|
||||||
|
|
|
@ -310,14 +310,23 @@ typedef unsigned short WCHAR, *PWCHAR;
|
||||||
|
|
||||||
/* 'Extended/Wide' numerical types */
|
/* 'Extended/Wide' numerical types */
|
||||||
#ifndef _ULONGLONG_
|
#ifndef _ULONGLONG_
|
||||||
#define _ULONGLONG_
|
# define _ULONGLONG_
|
||||||
|
# ifdef _MSC_VER
|
||||||
|
typedef signed __int64 LONGLONG, *PLONGLONG;
|
||||||
|
typedef unsigned __int64 ULONGLONG, *PULONGLONG;
|
||||||
|
# else
|
||||||
typedef signed __int64 DECLSPEC_ALIGN(8) LONGLONG, *PLONGLONG;
|
typedef signed __int64 DECLSPEC_ALIGN(8) LONGLONG, *PLONGLONG;
|
||||||
typedef unsigned __int64 DECLSPEC_ALIGN(8) ULONGLONG, *PULONGLONG;
|
typedef unsigned __int64 DECLSPEC_ALIGN(8) ULONGLONG, *PULONGLONG;
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef _DWORDLONG_
|
#ifndef _DWORDLONG_
|
||||||
#define _DWORDLONG_
|
# define _DWORDLONG_
|
||||||
typedef ULONGLONG DECLSPEC_ALIGN(8) DWORDLONG, *PDWORDLONG;
|
# ifdef _MSC_VER
|
||||||
|
typedef ULONGLONG DWORDLONG, *PDWORDLONG;
|
||||||
|
# else
|
||||||
|
typedef ULONGLONG DECLSPEC_ALIGN(8) DWORDLONG, *PDWORDLONG;
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* ANSI string types */
|
/* ANSI string types */
|
||||||
|
|
Loading…
Reference in New Issue