Skip to content

W
wine-cw
Commit 41d7518a authored by Dimitrie O. Paun's avatar Dimitrie O. Paun Committed by Alexandre Julliard
Browse files
Options

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

standalone processor to fail.
parent 899a4062
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 29 deletions
include/poppack.h
View file @ 41d7518a
......@@ -22,7 +22,6 @@
# 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
......@@ -32,9 +31,6 @@
# else
# pragma pack(4)
# endif
# elif !defined(RC_INVOKED)
# error "Adjusting the alignment is not supported with this compiler"
# endif
#elif defined(__WINE_PSHPACK_H2)
# ifndef __WINE_INTERNAL_POPPACK
......@@ -42,7 +38,6 @@
# 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
......@@ -52,9 +47,6 @@
# else
# pragma pack(4)
# endif
# elif !defined(RC_INVOKED)
# error "Adjusting the alignment is not supported with this compiler"
# endif
#elif defined(__WINE_PSHPACK_H)
# ifndef __WINE_INTERNAL_POPPACK
......@@ -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
......
include/pshpack1.h
View file @ 41d7518a
......@@ -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
#endif
include/pshpack2.h
View file @ 41d7518a
......@@ -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
#endif
include/pshpack4.h
View file @ 41d7518a
......@@ -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
#endif
include/pshpack8.h
View file @ 41d7518a
......@@ -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
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment