marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove checks from {pop,psh}pack[1248].h that were causing the 

standalone processor to fail.
oldstable
Dimitrie O. Paun 2003-09-11 23:08:58 +00:00 committed by Alexandre Julliard
parent 899a4062ed
commit 41d7518a62
5 changed files with 24 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
include/poppack.h
View File

@ -22,18 +22,14 @@
# endif
/* Depth == 3 */
# if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(_MSC_VER)
# if __WINE_PSHPACK_H2 == 1
# pragma pack(1)
# elif __WINE_PSHPACK_H2 == 2
# pragma pack(2)
# elif __WINE_PSHPACK_H2 == 8
# pragma pack(8)
# else
# pragma pack(4)
# endif
# elif !defined(RC_INVOKED)
# error "Adjusting the alignment is not supported with this compiler"
# if __WINE_PSHPACK_H2 == 1
# pragma pack(1)
# elif __WINE_PSHPACK_H2 == 2
# pragma pack(2)
# elif __WINE_PSHPACK_H2 == 8
# pragma pack(8)
# else
# pragma pack(4)
# endif
#elif defined(__WINE_PSHPACK_H2)
@ -42,18 +38,14 @@
# endif
/* Depth == 2 */
# if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(_MSC_VER)
# if __WINE_PSHPACK_H == 1
# pragma pack(1)
# elif __WINE_PSHPACK_H == 2
# pragma pack(2)
# elif __WINE_PSHPACK_H == 8
# pragma pack(8)
# else
# pragma pack(4)
# endif
# elif !defined(RC_INVOKED)
# error "Adjusting the alignment is not supported with this compiler"
# if __WINE_PSHPACK_H == 1
# pragma pack(1)
# elif __WINE_PSHPACK_H == 2
# pragma pack(2)
# elif __WINE_PSHPACK_H == 8
# pragma pack(8)
# else
# pragma pack(4)
# endif
#elif defined(__WINE_PSHPACK_H)
@ -62,13 +54,11 @@
# endif
/* Depth == 1 */
# if defined(__GNUC__) || defined(__SUNPRO_C) || defined(_MSC_VER)
# pragma pack()
# elif defined(__SUNPRO_CC)
# if defined(__SUNPRO_CC)
# warning "Assuming a default alignment of 4"
# pragma pack(4)
# elif !defined(RC_INVOKED)
# error "Adjusting the alignment is not supported with this compiler"
# else
# pragma pack()
# endif
#else

6
include/pshpack1.h
View File

@ -42,10 +42,6 @@
# pragma warning(disable:4103)
# endif
# if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(_MSC_VER)
# pragma pack(1)
# elif !defined(RC_INVOKED)
# error "Adjusting the alignment is not supported with this compiler"
# endif
# pragma pack(1)
#endif

6
include/pshpack2.h
View File

@ -42,10 +42,6 @@
# pragma warning(disable:4103)
# endif
# if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(_MSC_VER)
# pragma pack(2)
# elif !defined(RC_INVOKED)
# error "Adjusting the alignment is not supported with this compiler"
# endif
# pragma pack(2)
#endif

6
include/pshpack4.h
View File

@ -42,10 +42,6 @@
# pragma warning(disable:4103)
# endif
# if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(_MSC_VER)
# pragma pack(4)
# elif !defined(RC_INVOKED)
# error "Adjusting the alignment is not supported with this compiler"
# endif
# pragma pack(4)
#endif

8
include/pshpack8.h
View File

@ -42,11 +42,7 @@
# pragma warning(disable:4103)
# endif
# if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(_MSC_VER)
# pragma pack(8)
# warning "8 as alignment is not supported"
# elif !defined(RC_INVOKED)
# error "Adjusting the alignment is not supported with this compiler"
# endif
# pragma pack(8)
# warning "8 as alignment is not supported"
#endif