Skip to content

W
wine-winehq
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
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 50 deletions
include/poppack.h
View file @ 41d7518a
...@@ -22,18 +22,14 @@ ...@@ -22,18 +22,14 @@
# endif # endif
/* Depth == 3 */ /* Depth == 3 */
# if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(_MSC_VER) # if __WINE_PSHPACK_H2 == 1
# if __WINE_PSHPACK_H2 == 1 # pragma pack(1)
# pragma pack(1) # elif __WINE_PSHPACK_H2 == 2
# elif __WINE_PSHPACK_H2 == 2 # pragma pack(2)
# pragma pack(2) # elif __WINE_PSHPACK_H2 == 8
# elif __WINE_PSHPACK_H2 == 8 # pragma pack(8)
# pragma pack(8) # else
# else # pragma pack(4)
# pragma pack(4)
# endif
# elif !defined(RC_INVOKED)
# error "Adjusting the alignment is not supported with this compiler"
# endif # endif
#elif defined(__WINE_PSHPACK_H2) #elif defined(__WINE_PSHPACK_H2)
...@@ -42,18 +38,14 @@ ...@@ -42,18 +38,14 @@
# endif # endif
/* Depth == 2 */ /* Depth == 2 */
# if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(_MSC_VER) # if __WINE_PSHPACK_H == 1
# if __WINE_PSHPACK_H == 1 # pragma pack(1)
# pragma pack(1) # elif __WINE_PSHPACK_H == 2
# elif __WINE_PSHPACK_H == 2 # pragma pack(2)
# pragma pack(2) # elif __WINE_PSHPACK_H == 8
# elif __WINE_PSHPACK_H == 8 # pragma pack(8)
# pragma pack(8) # else
# else # pragma pack(4)
# pragma pack(4)
# endif
# elif !defined(RC_INVOKED)
# error "Adjusting the alignment is not supported with this compiler"
# endif # endif
#elif defined(__WINE_PSHPACK_H) #elif defined(__WINE_PSHPACK_H)
...@@ -62,13 +54,11 @@ ...@@ -62,13 +54,11 @@
# endif # endif
/* Depth == 1 */ /* Depth == 1 */
# if defined(__GNUC__) || defined(__SUNPRO_C) || defined(_MSC_VER) # if defined(__SUNPRO_CC)
# pragma pack()
# elif defined(__SUNPRO_CC)
# warning "Assuming a default alignment of 4" # warning "Assuming a default alignment of 4"
# pragma pack(4) # pragma pack(4)
# elif !defined(RC_INVOKED) # else
# error "Adjusting the alignment is not supported with this compiler" # pragma pack()
# endif # endif
#else #else
......
include/pshpack1.h
View file @ 41d7518a
...@@ -42,10 +42,6 @@ ...@@ -42,10 +42,6 @@
# pragma warning(disable:4103) # pragma warning(disable:4103)
# endif # endif
# if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(_MSC_VER) # pragma pack(1)
# pragma pack(1)
# elif !defined(RC_INVOKED)
# error "Adjusting the alignment is not supported with this compiler"
# endif
#endif #endif
include/pshpack2.h
View file @ 41d7518a
...@@ -42,10 +42,6 @@ ...@@ -42,10 +42,6 @@
# pragma warning(disable:4103) # pragma warning(disable:4103)
# endif # endif
# if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(_MSC_VER) # pragma pack(2)
# pragma pack(2)
# elif !defined(RC_INVOKED)
# error "Adjusting the alignment is not supported with this compiler"
# endif
#endif #endif
include/pshpack4.h
View file @ 41d7518a
...@@ -42,10 +42,6 @@ ...@@ -42,10 +42,6 @@
# pragma warning(disable:4103) # pragma warning(disable:4103)
# endif # endif
# if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(_MSC_VER) # pragma pack(4)
# pragma pack(4)
# elif !defined(RC_INVOKED)
# error "Adjusting the alignment is not supported with this compiler"
# endif
#endif #endif
include/pshpack8.h
View file @ 41d7518a
...@@ -42,11 +42,7 @@ ...@@ -42,11 +42,7 @@
# pragma warning(disable:4103) # pragma warning(disable:4103)
# endif # endif
# if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(_MSC_VER) # pragma pack(8)
# pragma pack(8) # warning "8 as alignment is not supported"
# warning "8 as alignment is not supported"
# elif !defined(RC_INVOKED)
# error "Adjusting the alignment is not supported with this compiler"
# endif
#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