Changeset 9143df1d51f39fe85d11ad4eb1aaa22e348bad85

Show
Ignore:
Timestamp:
03/31/08 14:31:26 (3 months ago)
Author:
Pierre d'Herbemont <pdherbemont@videolan.org>
git-committer:
Pierre d'Herbemont <pdherbemont@videolan.org> 1206966686 +0200
git-parent:

[e4d14a317076ece0a81bf0d6eccde0b79e5eee0f]

git-author:
Pierre d'Herbemont <pdherbemont@videolan.org> 1206966686 +0200
Message:

loader: Upgrade pop/push pack headers from latest wine git to fix compilation on darwin.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • libs/loader/wine/poppack.h

    r066e58d r9143df1  
    1 #ifdef __WINE_PSHPACK_H 
    2 #undef __WINE_PSHPACK_H 
    3  
    4 #if defined(__GNUC__) || defined(__SUNPRO_C) 
    5 #pragma pack() 
    6 #elif defined(__SUNPRO_CC) 
    7 #warning "Assumes default alignment is 4" 
    8 #pragma pack(4) 
    9 #elif !defined(RC_INVOKED) 
    10 #error "Restoration of the previous alignment isn't supported by the compiler" 
    11 #endif /* defined(__GNUC__) || defined(__SUNPRO_C) ; !defined(RC_INVOKED) */ 
    12  
    13 #else /* defined(__WINE_PSHPACK_H) */ 
     1/* 
     2 * Copyright (C) 1999 Patrik Stridvall 
     3 * 
     4 * This library is free software; you can redistribute it and/or 
     5 * modify it under the terms of the GNU Lesser General Public 
     6 * License as published by the Free Software Foundation; either 
     7 * version 2.1 of the License, or (at your option) any later version. 
     8 * 
     9 * This library is distributed in the hope that it will be useful, 
     10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
     11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
     12 * Lesser General Public License for more details. 
     13 * 
     14 * You should have received a copy of the GNU Lesser General Public 
     15 * License along with this library; if not, write to the Free Software 
     16 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 
     17 */ 
     18 
     19#if defined(__WINE_PSHPACK_H15) 
     20#  ifndef __WINE_INTERNAL_POPPACK 
     21#    undef __WINE_PSHPACK_H15 
     22#  endif 
     23/* Depth == 15 */ 
     24 
     25#  if __WINE_PSHPACK_H14 == 1 
     26#    pragma pack(1) 
     27#  elif __WINE_PSHPACK_H14 == 2 
     28#    pragma pack(2) 
     29#  elif __WINE_PSHPACK_H14 == 8 
     30#    pragma pack(8) 
     31#  else 
     32#    pragma pack(4) 
     33#  endif 
     34 
     35#elif defined(__WINE_PSHPACK_H14) 
     36#  ifndef __WINE_INTERNAL_POPPACK 
     37#    undef __WINE_PSHPACK_H14 
     38#  endif 
     39/* Depth == 14 */ 
     40 
     41#  if __WINE_PSHPACK_H13 == 1 
     42#    pragma pack(1) 
     43#  elif __WINE_PSHPACK_H13 == 2 
     44#    pragma pack(2) 
     45#  elif __WINE_PSHPACK_H13 == 8 
     46#    pragma pack(8) 
     47#  else 
     48#    pragma pack(4) 
     49#  endif 
     50 
     51#elif defined(__WINE_PSHPACK_H13) 
     52#  ifndef __WINE_INTERNAL_POPPACK 
     53#    undef __WINE_PSHPACK_H13 
     54#  endif 
     55/* Depth == 13 */ 
     56 
     57#  if __WINE_PSHPACK_H12 == 1 
     58#    pragma pack(1) 
     59#  elif __WINE_PSHPACK_H12 == 2 
     60#    pragma pack(2) 
     61#  elif __WINE_PSHPACK_H12 == 8 
     62#    pragma pack(8) 
     63#  else 
     64#    pragma pack(4) 
     65#  endif 
     66 
     67#elif defined(__WINE_PSHPACK_H12) 
     68#  ifndef __WINE_INTERNAL_POPPACK 
     69#    undef __WINE_PSHPACK_H12 
     70#  endif 
     71/* Depth == 12 */ 
     72 
     73#  if __WINE_PSHPACK_H11 == 1 
     74#    pragma pack(1) 
     75#  elif __WINE_PSHPACK_H11 == 2 
     76#    pragma pack(2) 
     77#  elif __WINE_PSHPACK_H11 == 8 
     78#    pragma pack(8) 
     79#  else 
     80#    pragma pack(4) 
     81#  endif 
     82 
     83#elif defined(__WINE_PSHPACK_H11) 
     84#  ifndef __WINE_INTERNAL_POPPACK 
     85#    undef __WINE_PSHPACK_H11 
     86#  endif 
     87/* Depth == 11 */ 
     88 
     89#  if __WINE_PSHPACK_H10 == 1 
     90#    pragma pack(1) 
     91#  elif __WINE_PSHPACK_H10 == 2 
     92#    pragma pack(2) 
     93#  elif __WINE_PSHPACK_H10 == 8 
     94#    pragma pack(8) 
     95#  else 
     96#    pragma pack(4) 
     97#  endif 
     98 
     99#elif defined(__WINE_PSHPACK_H10) 
     100#  ifndef __WINE_INTERNAL_POPPACK 
     101#    undef __WINE_PSHPACK_H10 
     102#  endif 
     103/* Depth == 10 */ 
     104 
     105#  if __WINE_PSHPACK_H9 == 1 
     106#    pragma pack(1) 
     107#  elif __WINE_PSHPACK_H9 == 2 
     108#    pragma pack(2) 
     109#  elif __WINE_PSHPACK_H9 == 8 
     110#    pragma pack(8) 
     111#  else 
     112#    pragma pack(4) 
     113#  endif 
     114 
     115#elif defined(__WINE_PSHPACK_H9) 
     116#  ifndef __WINE_INTERNAL_POPPACK 
     117#    undef __WINE_PSHPACK_H9 
     118#  endif 
     119/* Depth == 9 */ 
     120 
     121#  if __WINE_PSHPACK_H8 == 1 
     122#    pragma pack(1) 
     123#  elif __WINE_PSHPACK_H8 == 2 
     124#    pragma pack(2) 
     125#  elif __WINE_PSHPACK_H8 == 8 
     126#    pragma pack(8) 
     127#  else 
     128#    pragma pack(4) 
     129#  endif 
     130 
     131#elif defined(__WINE_PSHPACK_H8) 
     132#  ifndef __WINE_INTERNAL_POPPACK 
     133#    undef __WINE_PSHPACK_H8 
     134#  endif 
     135/* Depth == 8 */ 
     136 
     137#  if __WINE_PSHPACK_H7 == 1 
     138#    pragma pack(1) 
     139#  elif __WINE_PSHPACK_H7 == 2 
     140#    pragma pack(2) 
     141#  elif __WINE_PSHPACK_H7 == 8 
     142#    pragma pack(8) 
     143#  else 
     144#    pragma pack(4) 
     145#  endif 
     146 
     147#elif defined(__WINE_PSHPACK_H7) 
     148#  ifndef __WINE_INTERNAL_POPPACK 
     149#    undef __WINE_PSHPACK_H7 
     150#  endif 
     151/* Depth == 7 */ 
     152 
     153#  if __WINE_PSHPACK_H6 == 1 
     154#    pragma pack(1) 
     155#  elif __WINE_PSHPACK_H6 == 2 
     156#    pragma pack(2) 
     157#  elif __WINE_PSHPACK_H6 == 8 
     158#    pragma pack(8) 
     159#  else 
     160#    pragma pack(4) 
     161#  endif 
     162 
     163#elif defined(__WINE_PSHPACK_H6) 
     164#  ifndef __WINE_INTERNAL_POPPACK 
     165#    undef __WINE_PSHPACK_H6 
     166#  endif 
     167/* Depth == 6 */ 
     168 
     169#  if __WINE_PSHPACK_H5 == 1 
     170#    pragma pack(1) 
     171#  elif __WINE_PSHPACK_H5 == 2 
     172#    pragma pack(2) 
     173#  elif __WINE_PSHPACK_H5 == 8 
     174#    pragma pack(8) 
     175#  else 
     176#    pragma pack(4) 
     177#  endif 
     178 
     179#elif defined(__WINE_PSHPACK_H5) 
     180#  ifndef __WINE_INTERNAL_POPPACK 
     181#    undef __WINE_PSHPACK_H5 
     182#  endif 
     183/* Depth == 5 */ 
     184 
     185#  if __WINE_PSHPACK_H4 == 1 
     186#    pragma pack(1) 
     187#  elif __WINE_PSHPACK_H4 == 2 
     188#    pragma pack(2) 
     189#  elif __WINE_PSHPACK_H4 == 8 
     190#    pragma pack(8) 
     191#  else 
     192#    pragma pack(4) 
     193#  endif 
     194 
     195#elif defined(__WINE_PSHPACK_H4) 
     196#  ifndef __WINE_INTERNAL_POPPACK 
     197#    undef __WINE_PSHPACK_H4 
     198#  endif 
     199/* Depth == 4 */ 
     200 
     201#  if __WINE_PSHPACK_H3 == 1 
     202#    pragma pack(1) 
     203#  elif __WINE_PSHPACK_H3 == 2 
     204#    pragma pack(2) 
     205#  elif __WINE_PSHPACK_H3 == 8 
     206#    pragma pack(8) 
     207#  else 
     208#    pragma pack(4) 
     209#  endif 
     210 
     211#elif defined(__WINE_PSHPACK_H3) 
     212#  ifndef __WINE_INTERNAL_POPPACK 
     213#    undef __WINE_PSHPACK_H3 
     214#  endif 
     215/* Depth == 3 */ 
     216 
     217#  if __WINE_PSHPACK_H2 == 1 
     218#    pragma pack(1) 
     219#  elif __WINE_PSHPACK_H2 == 2 
     220#    pragma pack(2) 
     221#  elif __WINE_PSHPACK_H2 == 8 
     222#    pragma pack(8) 
     223#  else 
     224#    pragma pack(4) 
     225#  endif 
     226 
     227#elif defined(__WINE_PSHPACK_H2) 
     228#  ifndef __WINE_INTERNAL_POPPACK 
     229#    undef __WINE_PSHPACK_H2 
     230#  endif 
     231/* Depth == 2 */ 
     232 
     233#  if __WINE_PSHPACK_H == 1 
     234#    pragma pack(1) 
     235#  elif __WINE_PSHPACK_H == 2 
     236#    pragma pack(2) 
     237#  elif __WINE_PSHPACK_H == 8 
     238#    pragma pack(8) 
     239#  else 
     240#    pragma pack(4) 
     241#  endif 
     242 
     243#elif defined(__WINE_PSHPACK_H) 
     244#  ifndef __WINE_INTERNAL_POPPACK 
     245#    undef __WINE_PSHPACK_H 
     246#  endif 
     247/* Depth == 1 */ 
     248 
     249#  if defined(__SUNPRO_CC) 
     250#    warning "Assuming a default alignment of 4" 
     251#    pragma pack(4) 
     252#  else 
     253#    pragma pack() 
     254#  endif 
     255 
     256#else 
     257/* Depth == 0 ! */ 
     258 
    14259#error "Popping alignment isn't possible since no alignment has been pushed" 
    15 #endif /* defined(__WINE_PSHPACK_H) */ 
     260 
     261#endif 
     262 
     263#undef __WINE_INTERNAL_POPPACK 

  • libs/loader/wine/pshpack1.h

    r066e58d r9143df1  
    1 #ifndef __WINE_PSHPACK_H 
    2 #define __WINE_PSHPACK_H 1 
     1/* 
     2 * Copyright (C) 1999 Patrik Stridvall 
     3 * 
     4 * This library is free software; you can redistribute it and/or 
     5 * modify it under the terms of the GNU Lesser General Public 
     6 * License as published by the Free Software Foundation; either 
     7 * version 2.1 of the License, or (at your option) any later version. 
     8 * 
     9 * This library is distributed in the hope that it will be useful, 
     10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
     11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
     12 * Lesser General Public License for more details. 
     13 * 
     14 * You should have received a copy of the GNU Lesser General Public 
     15 * License along with this library; if not, write to the Free Software 
     16 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 
     17 */ 
    318 
    4 #if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) 
    5 //#pragma pack(1) 
    6 #elif !defined(RC_INVOKED) 
    7 #error "1 as alignment isn't supported by the compiler" 
    8 #endif /* defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) ; !defined(RC_INVOKED) */ 
     19#if defined(__WINE_PSHPACK_H15) 
    920 
    10 #else /* !defined(__WINE_PSHPACK_H) */ 
    11 #error "Nested pushing of alignment isn't supported by the compiler" 
    12 #endif /* !defined(__WINE_PSHPACK_H) */ 
     21/* Depth > 15 */ 
     22#  error "Alignment nesting > 15 is not supported" 
    1323 
     24#else 
     25 
     26#  if !defined(__WINE_PSHPACK_H) 
     27#    define __WINE_PSHPACK_H  1 
     28/* Depth == 1 */ 
     29#  elif !defined(__WINE_PSHPACK_H2) 
     30#    define __WINE_PSHPACK_H2 1 
     31/* Depth == 2 */ 
     32#    define __WINE_INTERNAL_POPPACK 
     33#    include <poppack.h> 
     34#  elif !defined(__WINE_PSHPACK_H3) 
     35#    define __WINE_PSHPACK_H3 1 
     36/* Depth == 3 */ 
     37#    define __WINE_INTERNAL_POPPACK 
     38#    include <poppack.h> 
     39#  elif !defined(__WINE_PSHPACK_H4) 
     40#    define __WINE_PSHPACK_H4 1 
     41/* Depth == 4 */ 
     42#    define __WINE_INTERNAL_POPPACK 
     43#    include <poppack.h> 
     44#  elif !defined(__WINE_PSHPACK_H5) 
     45#    define __WINE_PSHPACK_H5 1 
     46/* Depth == 5 */ 
     47#    define __WINE_INTERNAL_POPPACK 
     48#    include <poppack.h> 
     49#  elif !defined(__WINE_PSHPACK_H6) 
     50#    define __WINE_PSHPACK_H6 1 
     51/* Depth == 6 */ 
     52#    define __WINE_INTERNAL_POPPACK 
     53#    include <poppack.h> 
     54#  elif !defined(__WINE_PSHPACK_H7) 
     55#    define __WINE_PSHPACK_H7 1 
     56/* Depth == 7 */ 
     57#    define __WINE_INTERNAL_POPPACK 
     58#    include <poppack.h> 
     59#  elif !defined(__WINE_PSHPACK_H8) 
     60#    define __WINE_PSHPACK_H8 1 
     61/* Depth == 8 */ 
     62#    define __WINE_INTERNAL_POPPACK 
     63#    include <poppack.h> 
     64#  elif !defined(__WINE_PSHPACK_H9) 
     65#    define __WINE_PSHPACK_H9 1 
     66/* Depth == 9 */ 
     67#    define __WINE_INTERNAL_POPPACK 
     68#    include <poppack.h> 
     69#  elif !defined(__WINE_PSHPACK_H10) 
     70#    define __WINE_PSHPACK_H10 1 
     71/* Depth == 10 */ 
     72#    define __WINE_INTERNAL_POPPACK 
     73#    include <poppack.h> 
     74#  elif !defined(__WINE_PSHPACK_H11) 
     75#    define __WINE_PSHPACK_H11 1 
     76/* Depth == 11 */ 
     77#    define __WINE_INTERNAL_POPPACK 
     78#    include <poppack.h> 
     79#  elif !defined(__WINE_PSHPACK_H12) 
     80#    define __WINE_PSHPACK_H12 1 
     81/* Depth == 12 */ 
     82#    define __WINE_INTERNAL_POPPACK 
     83#    include <poppack.h> 
     84#  elif !defined(__WINE_PSHPACK_H13) 
     85#    define __WINE_PSHPACK_H13 1 
     86/* Depth == 13 */ 
     87#    define __WINE_INTERNAL_POPPACK 
     88#    include <poppack.h> 
     89#  elif !defined(__WINE_PSHPACK_H14) 
     90#    define __WINE_PSHPACK_H14 1 
     91/* Depth == 14 */ 
     92#    define __WINE_INTERNAL_POPPACK 
     93#    include <poppack.h> 
     94#  elif !defined(__WINE_PSHPACK_H15) 
     95#    define __WINE_PSHPACK_H15 1 
     96/* Depth == 15 */ 
     97#    define __WINE_INTERNAL_POPPACK 
     98#    include <poppack.h> 
     99#  endif 
     100 
     101#  if defined(_MSC_VER) && (_MSC_VER >= 800) 
     102#   pragma warning(disable:4103) 
     103#  endif 
     104 
     105#  pragma pack(1) 
     106 
     107#endif 

  • libs/loader/wine/pshpack2.h

    r066e58d r9143df1  
    1 #ifndef __WINE_PSHPACK_H 
    2 #define __WINE_PSHPACK_H 2 
     1/* 
     2 * Copyright (C) 1999 Patrik Stridvall 
     3 * 
     4 * This library is free software; you can redistribute it and/or 
     5 * modify it under the terms of the GNU Lesser General Public 
     6 * License as published by the Free Software Foundation; either 
     7 * version 2.1 of the License, or (at your option) any later version. 
     8 * 
     9 * This library is distributed in the hope that it will be useful, 
     10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
     11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
     12 * Lesser General Public License for more details. 
     13 * 
     14 * You should have received a copy of the GNU Lesser General Public 
     15 * License along with this library; if not, write to the Free Software 
     16 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 
     17 */ 
    318 
    4 #if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) 
    5 //#pragma pack(2) 
    6 #elif !defined(RC_INVOKED) 
    7 #error "2 as alignment isn't supported by the compiler" 
    8 #endif /* defined(__GNUC__) || defined(__SUNPRO_CC) ; !defined(RC_INVOKED) */ 
     19#if defined(__WINE_PSHPACK_H15) 
    920 
    10 #else /* !defined(__WINE_PSHPACK_H) */ 
    11 #error "Nested pushing of alignment isn't supported by the compiler" 
    12 #endif /* !defined(__WINE_PSHPACK_H) */ 
     21/* Depth > 15 */ 
     22#  error "Alignment nesting > 15 is not supported" 
     23 
     24#else 
     25 
     26#  if !defined(__WINE_PSHPACK_H) 
     27#    define __WINE_PSHPACK_H  2 
     28/* Depth == 1 */ 
     29#  elif !defined(__WINE_PSHPACK_H2) 
     30#    define __WINE_PSHPACK_H2 2 
     31/* Depth == 2 */ 
     32#    define __WINE_INTERNAL_POPPACK 
     33#    include <poppack.h> 
     34#  elif !defined(__WINE_PSHPACK_H3) 
     35#    define __WINE_PSHPACK_H3 2 
     36/* Depth == 3 */ 
     37#    define __WINE_INTERNAL_POPPACK 
     38#    include <poppack.h> 
     39#  elif !defined(__WINE_PSHPACK_H4) 
     40#    define __WINE_PSHPACK_H4 2 
     41/* Depth == 4 */ 
     42#    define __WINE_INTERNAL_POPPACK 
     43#    include <poppack.h> 
     44#  elif !defined(__WINE_PSHPACK_H5) 
     45#    define __WINE_PSHPACK_H5 2 
     46/* Depth == 5 */ 
     47#    define __WINE_INTERNAL_POPPACK 
     48#    include <poppack.h> 
     49#  elif !defined(__WINE_PSHPACK_H6) 
     50#    define __WINE_PSHPACK_H6 2 
     51/* Depth == 6 */ 
     52#    define __WINE_INTERNAL_POPPACK 
     53#    include <poppack.h> 
     54#  elif !defined(__WINE_PSHPACK_H7) 
     55#    define __WINE_PSHPACK_H7 2 
     56/* Depth == 7 */ 
     57#    define __WINE_INTERNAL_POPPACK 
     58#    include <poppack.h> 
     59#  elif !defined(__WINE_PSHPACK_H8) 
     60#    define __WINE_PSHPACK_H8 2 
     61/* Depth == 8 */ 
     62#    define __WINE_INTERNAL_POPPACK 
     63#    include <poppack.h> 
     64#  elif !defined(__WINE_PSHPACK_H9) 
     65#    define __WINE_PSHPACK_H9 2 
     66/* Depth == 9 */ 
     67#    define __WINE_INTERNAL_POPPACK 
     68#    include <poppack.h> 
     69#  elif !defined(__WINE_PSHPACK_H10) 
     70#    define __WINE_PSHPACK_H10 2 
     71/* Depth == 10 */ 
     72#    define __WINE_INTERNAL_POPPACK 
     73#    include <poppack.h> 
     74#  elif !defined(__WINE_PSHPACK_H11) 
     75#    define __WINE_PSHPACK_H11 2 
     76/* Depth == 11 */ 
     77#    define __WINE_INTERNAL_POPPACK 
     78#    include <poppack.h> 
     79#  elif !defined(__WINE_PSHPACK_H12) 
     80#    define __WINE_PSHPACK_H12 2 
     81/* Depth == 12 */ 
     82#    define __WINE_INTERNAL_POPPACK 
     83#    include <poppack.h> 
     84#  elif !defined(__WINE_PSHPACK_H13) 
     85#    define __WINE_PSHPACK_H13 2 
     86/* Depth == 13 */ 
     87#    define __WINE_INTERNAL_POPPACK 
     88#    include <poppack.h> 
     89#  elif !defined(__WINE_PSHPACK_H14) 
     90#    define __WINE_PSHPACK_H14 2 
     91/* Depth == 14 */ 
     92#    define __WINE_INTERNAL_POPPACK 
     93#    include <poppack.h> 
     94#  elif !defined(__WINE_PSHPACK_H15) 
     95#    define __WINE_PSHPACK_H15 2 
     96/* Depth == 15 */ 
     97#    define __WINE_INTERNAL_POPPACK 
     98#    include <poppack.h> 
     99#  endif 
     100 
     101#  if defined(_MSC_VER) && (_MSC_VER >= 800) 
     102#   pragma warning(disable:4103) 
     103#  endif 
     104 
     105#  pragma pack(2) 
     106 
     107#endif