From 11fdd9584d2240ba99899c35bbebec8758065c62 Mon Sep 17 00:00:00 2001 From: Bill Medland Date: Thu, 20 Apr 2006 10:45:39 -0700 Subject: [PATCH] include: Expand pack nesting from 3 to 15 levels. --- include/poppack.h | 194 ++++++++++++++++++++++++++++++++++++++++++++- include/pshpack1.h | 66 ++++++++++++++- include/pshpack2.h | 66 ++++++++++++++- include/pshpack4.h | 66 ++++++++++++++- include/pshpack8.h | 66 ++++++++++++++- 5 files changed, 445 insertions(+), 13 deletions(-) diff --git a/include/poppack.h b/include/poppack.h index ef751a9fe1f..c1f5e0e072f 100644 --- a/include/poppack.h +++ b/include/poppack.h @@ -16,7 +16,199 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#if defined(__WINE_PSHPACK_H3) +#if defined(__WINE_PSHPACK_H15) +# ifndef __WINE_INTERNAL_POPPACK +# undef __WINE_PSHPACK_H15 +# endif +/* Depth == 15 */ + +# if __WINE_PSHPACK_H14 == 1 +# pragma pack(1) +# elif __WINE_PSHPACK_H14 == 2 +# pragma pack(2) +# elif __WINE_PSHPACK_H14 == 8 +# pragma pack(8) +# else +# pragma pack(4) +# endif + +#elif defined(__WINE_PSHPACK_H14) +# ifndef __WINE_INTERNAL_POPPACK +# undef __WINE_PSHPACK_H14 +# endif +/* Depth == 14 */ + +# if __WINE_PSHPACK_H13 == 1 +# pragma pack(1) +# elif __WINE_PSHPACK_H13 == 2 +# pragma pack(2) +# elif __WINE_PSHPACK_H13 == 8 +# pragma pack(8) +# else +# pragma pack(4) +# endif + +#elif defined(__WINE_PSHPACK_H13) +# ifndef __WINE_INTERNAL_POPPACK +# undef __WINE_PSHPACK_H13 +# endif +/* Depth == 13 */ + +# if __WINE_PSHPACK_H12 == 1 +# pragma pack(1) +# elif __WINE_PSHPACK_H12 == 2 +# pragma pack(2) +# elif __WINE_PSHPACK_H12 == 8 +# pragma pack(8) +# else +# pragma pack(4) +# endif + +#elif defined(__WINE_PSHPACK_H12) +# ifndef __WINE_INTERNAL_POPPACK +# undef __WINE_PSHPACK_H12 +# endif +/* Depth == 12 */ + +# if __WINE_PSHPACK_H11 == 1 +# pragma pack(1) +# elif __WINE_PSHPACK_H11 == 2 +# pragma pack(2) +# elif __WINE_PSHPACK_H11 == 8 +# pragma pack(8) +# else +# pragma pack(4) +# endif + +#elif defined(__WINE_PSHPACK_H11) +# ifndef __WINE_INTERNAL_POPPACK +# undef __WINE_PSHPACK_H11 +# endif +/* Depth == 11 */ + +# if __WINE_PSHPACK_H10 == 1 +# pragma pack(1) +# elif __WINE_PSHPACK_H10 == 2 +# pragma pack(2) +# elif __WINE_PSHPACK_H10 == 8 +# pragma pack(8) +# else +# pragma pack(4) +# endif + +#elif defined(__WINE_PSHPACK_H10) +# ifndef __WINE_INTERNAL_POPPACK +# undef __WINE_PSHPACK_H10 +# endif +/* Depth == 10 */ + +# if __WINE_PSHPACK_H9 == 1 +# pragma pack(1) +# elif __WINE_PSHPACK_H9 == 2 +# pragma pack(2) +# elif __WINE_PSHPACK_H9 == 8 +# pragma pack(8) +# else +# pragma pack(4) +# endif + +#elif defined(__WINE_PSHPACK_H9) +# ifndef __WINE_INTERNAL_POPPACK +# undef __WINE_PSHPACK_H9 +# endif +/* Depth == 9 */ + +# if __WINE_PSHPACK_H8 == 1 +# pragma pack(1) +# elif __WINE_PSHPACK_H8 == 2 +# pragma pack(2) +# elif __WINE_PSHPACK_H8 == 8 +# pragma pack(8) +# else +# pragma pack(4) +# endif + +#elif defined(__WINE_PSHPACK_H8) +# ifndef __WINE_INTERNAL_POPPACK +# undef __WINE_PSHPACK_H8 +# endif +/* Depth == 8 */ + +# if __WINE_PSHPACK_H7 == 1 +# pragma pack(1) +# elif __WINE_PSHPACK_H7 == 2 +# pragma pack(2) +# elif __WINE_PSHPACK_H7 == 8 +# pragma pack(8) +# else +# pragma pack(4) +# endif + +#elif defined(__WINE_PSHPACK_H7) +# ifndef __WINE_INTERNAL_POPPACK +# undef __WINE_PSHPACK_H7 +# endif +/* Depth == 7 */ + +# if __WINE_PSHPACK_H6 == 1 +# pragma pack(1) +# elif __WINE_PSHPACK_H6 == 2 +# pragma pack(2) +# elif __WINE_PSHPACK_H6 == 8 +# pragma pack(8) +# else +# pragma pack(4) +# endif + +#elif defined(__WINE_PSHPACK_H6) +# ifndef __WINE_INTERNAL_POPPACK +# undef __WINE_PSHPACK_H6 +# endif +/* Depth == 6 */ + +# if __WINE_PSHPACK_H5 == 1 +# pragma pack(1) +# elif __WINE_PSHPACK_H5 == 2 +# pragma pack(2) +# elif __WINE_PSHPACK_H5 == 8 +# pragma pack(8) +# else +# pragma pack(4) +# endif + +#elif defined(__WINE_PSHPACK_H5) +# ifndef __WINE_INTERNAL_POPPACK +# undef __WINE_PSHPACK_H5 +# endif +/* Depth == 5 */ + +# if __WINE_PSHPACK_H4 == 1 +# pragma pack(1) +# elif __WINE_PSHPACK_H4 == 2 +# pragma pack(2) +# elif __WINE_PSHPACK_H4 == 8 +# pragma pack(8) +# else +# pragma pack(4) +# endif + +#elif defined(__WINE_PSHPACK_H4) +# ifndef __WINE_INTERNAL_POPPACK +# undef __WINE_PSHPACK_H4 +# endif +/* Depth == 4 */ + +# if __WINE_PSHPACK_H3 == 1 +# pragma pack(1) +# elif __WINE_PSHPACK_H3 == 2 +# pragma pack(2) +# elif __WINE_PSHPACK_H3 == 8 +# pragma pack(8) +# else +# pragma pack(4) +# endif + +#elif defined(__WINE_PSHPACK_H3) # ifndef __WINE_INTERNAL_POPPACK # undef __WINE_PSHPACK_H3 # endif diff --git a/include/pshpack1.h b/include/pshpack1.h index 8fbcf9d5678..001e3f320a2 100644 --- a/include/pshpack1.h +++ b/include/pshpack1.h @@ -16,10 +16,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#if defined(__WINE_PSHPACK_H3) +#if defined(__WINE_PSHPACK_H15) - /* Depth > 3 */ -# error "Alignment nesting > 3 is not supported" + /* Depth > 15 */ +# error "Alignment nesting > 15 is not supported" #else @@ -36,6 +36,66 @@ /* Depth == 3 */ # define __WINE_INTERNAL_POPPACK # include +# elif !defined(__WINE_PSHPACK_H4) +# define __WINE_PSHPACK_H4 1 + /* Depth == 4 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H5) +# define __WINE_PSHPACK_H5 1 + /* Depth == 5 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H6) +# define __WINE_PSHPACK_H6 1 + /* Depth == 6 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H7) +# define __WINE_PSHPACK_H7 1 + /* Depth == 7 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H8) +# define __WINE_PSHPACK_H8 1 + /* Depth == 8 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H9) +# define __WINE_PSHPACK_H9 1 + /* Depth == 9 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H10) +# define __WINE_PSHPACK_H10 1 + /* Depth == 10 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H11) +# define __WINE_PSHPACK_H11 1 + /* Depth == 11 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H12) +# define __WINE_PSHPACK_H12 1 + /* Depth == 12 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H13) +# define __WINE_PSHPACK_H13 1 + /* Depth == 13 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H14) +# define __WINE_PSHPACK_H14 1 + /* Depth == 14 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H15) +# define __WINE_PSHPACK_H15 1 + /* Depth == 15 */ +# define __WINE_INTERNAL_POPPACK +# include # endif # if defined(_MSC_VER) && (_MSC_VER >= 800) diff --git a/include/pshpack2.h b/include/pshpack2.h index 03ff21707f4..0af12093792 100644 --- a/include/pshpack2.h +++ b/include/pshpack2.h @@ -16,10 +16,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#if defined(__WINE_PSHPACK_H3) +#if defined(__WINE_PSHPACK_H15) - /* Depth > 3 */ -# error "Alignment nesting > 3 is not supported" + /* Depth > 15 */ +# error "Alignment nesting > 15 is not supported" #else @@ -36,6 +36,66 @@ /* Depth == 3 */ # define __WINE_INTERNAL_POPPACK # include +# elif !defined(__WINE_PSHPACK_H4) +# define __WINE_PSHPACK_H4 2 + /* Depth == 4 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H5) +# define __WINE_PSHPACK_H5 2 + /* Depth == 5 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H6) +# define __WINE_PSHPACK_H6 2 + /* Depth == 6 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H7) +# define __WINE_PSHPACK_H7 2 + /* Depth == 7 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H8) +# define __WINE_PSHPACK_H8 2 + /* Depth == 8 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H9) +# define __WINE_PSHPACK_H9 2 + /* Depth == 9 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H10) +# define __WINE_PSHPACK_H10 2 + /* Depth == 10 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H11) +# define __WINE_PSHPACK_H11 2 + /* Depth == 11 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H12) +# define __WINE_PSHPACK_H12 2 + /* Depth == 12 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H13) +# define __WINE_PSHPACK_H13 2 + /* Depth == 13 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H14) +# define __WINE_PSHPACK_H14 2 + /* Depth == 14 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H15) +# define __WINE_PSHPACK_H15 2 + /* Depth == 15 */ +# define __WINE_INTERNAL_POPPACK +# include # endif # if defined(_MSC_VER) && (_MSC_VER >= 800) diff --git a/include/pshpack4.h b/include/pshpack4.h index e8b0bd1b6d4..e1aa70f8d42 100644 --- a/include/pshpack4.h +++ b/include/pshpack4.h @@ -16,10 +16,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#if defined(__WINE_PSHPACK_H3) +#if defined(__WINE_PSHPACK_H15) - /* Depth > 3 */ -# error "Alignment nesting > 3 is not supported" + /* Depth > 15 */ +# error "Alignment nesting > 15 is not supported" #else @@ -36,6 +36,66 @@ /* Depth == 3 */ # define __WINE_INTERNAL_POPPACK # include +# elif !defined(__WINE_PSHPACK_H4) +# define __WINE_PSHPACK_H4 4 + /* Depth == 4 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H5) +# define __WINE_PSHPACK_H5 4 + /* Depth == 5 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H6) +# define __WINE_PSHPACK_H6 4 + /* Depth == 6 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H7) +# define __WINE_PSHPACK_H7 4 + /* Depth == 7 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H8) +# define __WINE_PSHPACK_H8 4 + /* Depth == 8 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H9) +# define __WINE_PSHPACK_H9 4 + /* Depth == 9 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H10) +# define __WINE_PSHPACK_H10 4 + /* Depth == 10 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H11) +# define __WINE_PSHPACK_H11 4 + /* Depth == 11 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H12) +# define __WINE_PSHPACK_H12 4 + /* Depth == 12 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H13) +# define __WINE_PSHPACK_H13 4 + /* Depth == 13 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H14) +# define __WINE_PSHPACK_H14 4 + /* Depth == 14 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H15) +# define __WINE_PSHPACK_H15 4 + /* Depth == 15 */ +# define __WINE_INTERNAL_POPPACK +# include # endif # if defined(_MSC_VER) && (_MSC_VER >= 800) diff --git a/include/pshpack8.h b/include/pshpack8.h index 7ec95a0e23a..7bc05b07e17 100644 --- a/include/pshpack8.h +++ b/include/pshpack8.h @@ -16,10 +16,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#if defined(__WINE_PSHPACK_H3) +#if defined(__WINE_PSHPACK_H15) - /* Depth > 3 */ -# error "Alignment nesting > 3 is not supported" + /* Depth > 15 */ +# error "Alignment nesting > 15 is not supported" #else @@ -36,6 +36,66 @@ /* Depth == 3 */ # define __WINE_INTERNAL_POPPACK # include +# elif !defined(__WINE_PSHPACK_H4) +# define __WINE_PSHPACK_H4 8 + /* Depth == 4 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H5) +# define __WINE_PSHPACK_H5 8 + /* Depth == 5 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H6) +# define __WINE_PSHPACK_H6 8 + /* Depth == 6 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H7) +# define __WINE_PSHPACK_H7 8 + /* Depth == 7 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H8) +# define __WINE_PSHPACK_H8 8 + /* Depth == 8 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H9) +# define __WINE_PSHPACK_H9 8 + /* Depth == 9 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H10) +# define __WINE_PSHPACK_H10 8 + /* Depth == 10 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H11) +# define __WINE_PSHPACK_H11 8 + /* Depth == 11 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H12) +# define __WINE_PSHPACK_H12 8 + /* Depth == 12 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H13) +# define __WINE_PSHPACK_H13 8 + /* Depth == 13 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H14) +# define __WINE_PSHPACK_H14 8 + /* Depth == 14 */ +# define __WINE_INTERNAL_POPPACK +# include +# elif !defined(__WINE_PSHPACK_H15) +# define __WINE_PSHPACK_H15 8 + /* Depth == 15 */ +# define __WINE_INTERNAL_POPPACK +# include # endif # if defined(_MSC_VER) && (_MSC_VER >= 800)