reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-24 20:30:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Conditionally add DECLSPEC_ALIGN(8) to wine's 64-bit types and leave

Browse Source 
the modifier off when compiling with msvc.
This commit is contained in:
James Hawkins 2005-02-18 12:56:35 +00:00 committed by Alexandre Julliard
parent 87844214ab
commit ee8479596a
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/basetsd.h
View File

@ -73,17 +73,26 @@ extern "C" {
typedef signed char INT8, *PINT8;
typedef signed short INT16, *PINT16;
typedef signed int INT32, *PINT32;
typedef signed __int64 DECLSPEC_ALIGN(8) INT64, *PINT64;
typedef unsigned char UINT8, *PUINT8;
typedef unsigned short UINT16, *PUINT16;
typedef unsigned int UINT32, *PUINT32;
typedef unsigned __int64 DECLSPEC_ALIGN(8) UINT64, *PUINT64;
typedef signed int LONG32, *PLONG32;
typedef unsigned int ULONG32, *PULONG32;
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 unsigned __int64 DECLSPEC_ALIGN(8) ULONG64, *PULONG64;
typedef unsigned __int64 DECLSPEC_ALIGN(8) DWORD64, *PDWORD64;
#endif
/* Win32 or Win64 dependent typedef/defines. */

15
include/winnt.h
View File

@ -310,14 +310,23 @@ typedef unsigned short WCHAR, *PWCHAR;
/* 'Extended/Wide' numerical types */
#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 unsigned __int64 DECLSPEC_ALIGN(8) ULONGLONG, *PULONGLONG;
# endif
#endif
#ifndef _DWORDLONG_
#define _DWORDLONG_
typedef ULONGLONG DECLSPEC_ALIGN(8) DWORDLONG, *PDWORDLONG;
# define _DWORDLONG_
# ifdef _MSC_VER
typedef ULONGLONG DWORDLONG, *PDWORDLONG;
# else
typedef ULONGLONG DECLSPEC_ALIGN(8) DWORDLONG, *PDWORDLONG;
# endif
#endif
/* ANSI string types */