From 41d7518a624d7e303daccc82365033ec8bad3a93 Mon Sep 17 00:00:00 2001
From: "Dimitrie O. Paun" <dpaun@rogers.com>
Date: Thu, 11 Sep 2003 23:08:58 +0000
Subject: [PATCH] Remove checks from {pop,psh}pack[1248].h that were causing
 the standalone processor to fail.

---
 include/poppack.h  | 48 ++++++++++++++++++----------------------------
 include/pshpack1.h |  6 +-----
 include/pshpack2.h |  6 +-----
 include/pshpack4.h |  6 +-----
 include/pshpack8.h |  8 ++------
 5 files changed, 24 insertions(+), 50 deletions(-)

diff --git a/include/poppack.h b/include/poppack.h
index 82c83c6f97c..ef751a9fe1f 100644
--- 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
diff --git a/include/pshpack1.h b/include/pshpack1.h
index 961dab51c5a..60fcfb07349 100644
--- 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
diff --git a/include/pshpack2.h b/include/pshpack2.h
index 8ef24858e00..9a32ac4a5de 100644
--- 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
diff --git a/include/pshpack4.h b/include/pshpack4.h
index 1042129e25a..10443b189f9 100644
--- 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
diff --git a/include/pshpack8.h b/include/pshpack8.h
index b1b212bfe05..f7bb7b2fd4d 100644
--- 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