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

standalone processor to fail.

Remove checks from {pop,psh}pack[1248].h that were causing the
41d7518a · Dimitrie O. Paun · Alexandre Julliard · 899a4062 · 41d7518a · 41d7518a
Commit 41d7518a authored Sep 11, 2003 by Dimitrie O. Paun Committed by Alexandre Julliard Sep 11, 2003
Showing with 24 additions and 50 deletions

poppack.h include/poppack.h +19 -29

pshpack1.h include/pshpack1.h +1 -5

pshpack2.h include/pshpack2.h +1 -5

pshpack4.h include/pshpack4.h +1 -5

pshpack8.h include/pshpack8.h +2 -6

No files found.
--- a/include/poppack.h
+++ b/include/poppack.h
@@ -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

--- a/include/pshpack1.h
+++ b/include/pshpack1.h
@@ -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
--- a/include/pshpack2.h
+++ b/include/pshpack2.h
@@ -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
--- a/include/pshpack4.h
+++ b/include/pshpack4.h
@@ -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
--- a/include/pshpack8.h
+++ b/include/pshpack8.h
@@ -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