diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-07-12 12:31:13 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-07-12 12:31:13 +0000 |
| commit | ecde3c9f3e46a78f653829f8b12241dc7fbe9fb2 (patch) | |
| tree | 2da90cafcf53ca75af95ae22c8e9269a55447e4b /src/libw32dll | |
| parent | 7329ae3b83a71b6bc9b55c659a582afb307acd08 (diff) | |
| download | xine-lib-ecde3c9f3e46a78f653829f8b12241dc7fbe9fb2.tar.gz xine-lib-ecde3c9f3e46a78f653829f8b12241dc7fbe9fb2.tar.bz2 | |
- adding support for the Intel compiler icc
- general multipass compilation make targets
CVS patchset: 5149
CVS date: 2003/07/12 12:31:13
Diffstat (limited to 'src/libw32dll')
| -rw-r--r-- | src/libw32dll/wine/basetsd.h | 16 | ||||
| -rw-r--r-- | src/libw32dll/wine/poppack.h | 2 | ||||
| -rw-r--r-- | src/libw32dll/wine/pshpack1.h | 2 | ||||
| -rw-r--r-- | src/libw32dll/wine/pshpack2.h | 2 | ||||
| -rw-r--r-- | src/libw32dll/wine/pshpack4.h | 2 | ||||
| -rw-r--r-- | src/libw32dll/wine/windef.h | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/src/libw32dll/wine/basetsd.h b/src/libw32dll/wine/basetsd.h index 7b5d3aba9..ac988d54b 100644 --- a/src/libw32dll/wine/basetsd.h +++ b/src/libw32dll/wine/basetsd.h @@ -28,16 +28,16 @@ extern "C" { /* Type model indepent typedefs */ +#ifndef __ICC typedef char __int8; -typedef unsigned char __uint8; - -typedef short __int16; -typedef unsigned short __uint16; - -typedef int __int32; -typedef unsigned int __uint32; +typedef short __int16; +typedef int __int32; +typedef long long __int64; +#endif -typedef long long __int64; +typedef unsigned char __uint8; +typedef unsigned short __uint16; +typedef unsigned int __uint32; typedef unsigned long long __uint64; #if defined(_WIN64) diff --git a/src/libw32dll/wine/poppack.h b/src/libw32dll/wine/poppack.h index 710479159..97c51987e 100644 --- a/src/libw32dll/wine/poppack.h +++ b/src/libw32dll/wine/poppack.h @@ -1,7 +1,7 @@ #ifdef __WINE_PSHPACK_H #undef __WINE_PSHPACK_H -#if defined(__GNUC__) || defined(__SUNPRO_C) +#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__ICC) #pragma pack() #elif defined(__SUNPRO_CC) #warning "Assumes default alignment is 4" diff --git a/src/libw32dll/wine/pshpack1.h b/src/libw32dll/wine/pshpack1.h index e560250c2..659b2ed67 100644 --- a/src/libw32dll/wine/pshpack1.h +++ b/src/libw32dll/wine/pshpack1.h @@ -1,7 +1,7 @@ #ifndef __WINE_PSHPACK_H #define __WINE_PSHPACK_H 1 -#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) +#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__ICC) //#pragma pack(1) #elif !defined(RC_INVOKED) #error "1 as alignment isn't supported by the compiler" diff --git a/src/libw32dll/wine/pshpack2.h b/src/libw32dll/wine/pshpack2.h index 887b1e17b..a0830be0b 100644 --- a/src/libw32dll/wine/pshpack2.h +++ b/src/libw32dll/wine/pshpack2.h @@ -1,7 +1,7 @@ #ifndef __WINE_PSHPACK_H #define __WINE_PSHPACK_H 2 -#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) +#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__ICC) //#pragma pack(2) #elif !defined(RC_INVOKED) #error "2 as alignment isn't supported by the compiler" diff --git a/src/libw32dll/wine/pshpack4.h b/src/libw32dll/wine/pshpack4.h index 9fdaf70a7..3f85316b1 100644 --- a/src/libw32dll/wine/pshpack4.h +++ b/src/libw32dll/wine/pshpack4.h @@ -1,7 +1,7 @@ #ifndef __WINE_PSHPACK_H #define __WINE_PSHPACK_H 4 -#if defined(__GNUC__) || defined(__SUNPRO_CC) +#if defined(__GNUC__) || defined(__SUNPRO_CC) || defined(__ICC) //#pragma pack(4) #elif defined(__SUNPRO_C) //#pragma pack() diff --git a/src/libw32dll/wine/windef.h b/src/libw32dll/wine/windef.h index d0e4cefc5..e7f691a02 100644 --- a/src/libw32dll/wine/windef.h +++ b/src/libw32dll/wine/windef.h @@ -493,7 +493,7 @@ typedef LRESULT CALLBACK (*WNDPROC16)(HWND16,UINT16,WPARAM16,LPARAM); /* Macro for structure packing. */ -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__ICC) #ifndef _EGCS_ #define WINE_PACKED __attribute__((packed)) #define WINE_UNUSED __attribute__((unused)) |