forked from videolan/vlc
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
loader: Upgrade pop/push pack headers from latest wine git to fix com…
…pilation on darwin.
- Loading branch information
1 parent
e4d14a3
commit 9143df1
Showing
3 changed files
with
473 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,263 @@ | ||
| #ifdef __WINE_PSHPACK_H | ||
| #undef __WINE_PSHPACK_H | ||
|
|
||
| #if defined(__GNUC__) || defined(__SUNPRO_C) | ||
| #pragma pack() | ||
| #elif defined(__SUNPRO_CC) | ||
| #warning "Assumes default alignment is 4" | ||
| #pragma pack(4) | ||
| #elif !defined(RC_INVOKED) | ||
| #error "Restoration of the previous alignment isn't supported by the compiler" | ||
| #endif /* defined(__GNUC__) || defined(__SUNPRO_C) ; !defined(RC_INVOKED) */ | ||
|
|
||
| #else /* defined(__WINE_PSHPACK_H) */ | ||
| /* | ||
| * Copyright (C) 1999 Patrik Stridvall | ||
| * | ||
| * This library is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 2.1 of the License, or (at your option) any later version. | ||
| * | ||
| * This library is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this library; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA | ||
| */ | ||
|
|
||
| #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 | ||
| /* Depth == 3 */ | ||
|
|
||
| # 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) | ||
| # ifndef __WINE_INTERNAL_POPPACK | ||
| # undef __WINE_PSHPACK_H2 | ||
| # endif | ||
| /* Depth == 2 */ | ||
|
|
||
| # 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) | ||
| # ifndef __WINE_INTERNAL_POPPACK | ||
| # undef __WINE_PSHPACK_H | ||
| # endif | ||
| /* Depth == 1 */ | ||
|
|
||
| # if defined(__SUNPRO_CC) | ||
| # warning "Assuming a default alignment of 4" | ||
| # pragma pack(4) | ||
| # else | ||
| # pragma pack() | ||
| # endif | ||
|
|
||
| #else | ||
| /* Depth == 0 ! */ | ||
|
|
||
| #error "Popping alignment isn't possible since no alignment has been pushed" | ||
| #endif /* defined(__WINE_PSHPACK_H) */ | ||
|
|
||
| #endif | ||
|
|
||
| #undef __WINE_INTERNAL_POPPACK |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,107 @@ | ||
| #ifndef __WINE_PSHPACK_H | ||
| #define __WINE_PSHPACK_H 1 | ||
| /* | ||
| * Copyright (C) 1999 Patrik Stridvall | ||
| * | ||
| * This library is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU Lesser General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 2.1 of the License, or (at your option) any later version. | ||
| * | ||
| * This library is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this library; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA | ||
| */ | ||
|
|
||
| #if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) | ||
| //#pragma pack(1) | ||
| #elif !defined(RC_INVOKED) | ||
| #error "1 as alignment isn't supported by the compiler" | ||
| #endif /* defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) ; !defined(RC_INVOKED) */ | ||
| #if defined(__WINE_PSHPACK_H15) | ||
|
|
||
| #else /* !defined(__WINE_PSHPACK_H) */ | ||
| #error "Nested pushing of alignment isn't supported by the compiler" | ||
| #endif /* !defined(__WINE_PSHPACK_H) */ | ||
| /* Depth > 15 */ | ||
| # error "Alignment nesting > 15 is not supported" | ||
|
|
||
| #else | ||
|
|
||
| # if !defined(__WINE_PSHPACK_H) | ||
| # define __WINE_PSHPACK_H 1 | ||
| /* Depth == 1 */ | ||
| # elif !defined(__WINE_PSHPACK_H2) | ||
| # define __WINE_PSHPACK_H2 1 | ||
| /* Depth == 2 */ | ||
| # define __WINE_INTERNAL_POPPACK | ||
| # include <poppack.h> | ||
| # elif !defined(__WINE_PSHPACK_H3) | ||
| # define __WINE_PSHPACK_H3 1 | ||
| /* Depth == 3 */ | ||
| # define __WINE_INTERNAL_POPPACK | ||
| # include <poppack.h> | ||
| # elif !defined(__WINE_PSHPACK_H4) | ||
| # define __WINE_PSHPACK_H4 1 | ||
| /* Depth == 4 */ | ||
| # define __WINE_INTERNAL_POPPACK | ||
| # include <poppack.h> | ||
| # elif !defined(__WINE_PSHPACK_H5) | ||
| # define __WINE_PSHPACK_H5 1 | ||
| /* Depth == 5 */ | ||
| # define __WINE_INTERNAL_POPPACK | ||
| # include <poppack.h> | ||
| # elif !defined(__WINE_PSHPACK_H6) | ||
| # define __WINE_PSHPACK_H6 1 | ||
| /* Depth == 6 */ | ||
| # define __WINE_INTERNAL_POPPACK | ||
| # include <poppack.h> | ||
| # elif !defined(__WINE_PSHPACK_H7) | ||
| # define __WINE_PSHPACK_H7 1 | ||
| /* Depth == 7 */ | ||
| # define __WINE_INTERNAL_POPPACK | ||
| # include <poppack.h> | ||
| # elif !defined(__WINE_PSHPACK_H8) | ||
| # define __WINE_PSHPACK_H8 1 | ||
| /* Depth == 8 */ | ||
| # define __WINE_INTERNAL_POPPACK | ||
| # include <poppack.h> | ||
| # elif !defined(__WINE_PSHPACK_H9) | ||
| # define __WINE_PSHPACK_H9 1 | ||
| /* Depth == 9 */ | ||
| # define __WINE_INTERNAL_POPPACK | ||
| # include <poppack.h> | ||
| # elif !defined(__WINE_PSHPACK_H10) | ||
| # define __WINE_PSHPACK_H10 1 | ||
| /* Depth == 10 */ | ||
| # define __WINE_INTERNAL_POPPACK | ||
| # include <poppack.h> | ||
| # elif !defined(__WINE_PSHPACK_H11) | ||
| # define __WINE_PSHPACK_H11 1 | ||
| /* Depth == 11 */ | ||
| # define __WINE_INTERNAL_POPPACK | ||
| # include <poppack.h> | ||
| # elif !defined(__WINE_PSHPACK_H12) | ||
| # define __WINE_PSHPACK_H12 1 | ||
| /* Depth == 12 */ | ||
| # define __WINE_INTERNAL_POPPACK | ||
| # include <poppack.h> | ||
| # elif !defined(__WINE_PSHPACK_H13) | ||
| # define __WINE_PSHPACK_H13 1 | ||
| /* Depth == 13 */ | ||
| # define __WINE_INTERNAL_POPPACK | ||
| # include <poppack.h> | ||
| # elif !defined(__WINE_PSHPACK_H14) | ||
| # define __WINE_PSHPACK_H14 1 | ||
| /* Depth == 14 */ | ||
| # define __WINE_INTERNAL_POPPACK | ||
| # include <poppack.h> | ||
| # elif !defined(__WINE_PSHPACK_H15) | ||
| # define __WINE_PSHPACK_H15 1 | ||
| /* Depth == 15 */ | ||
| # define __WINE_INTERNAL_POPPACK | ||
| # include <poppack.h> | ||
| # endif | ||
|
|
||
| # if defined(_MSC_VER) && (_MSC_VER >= 800) | ||
| # pragma warning(disable:4103) | ||
| # endif | ||
|
|
||
| # pragma pack(1) | ||
|
|
||
| #endif |
Oops, something went wrong.