diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-10 13:57:26 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-10 13:57:26 +0200 |
| commit | 2de490e2847edaaa11e1ac1baefc5bcd6ebac2fb (patch) | |
| tree | c05827bc158adc45643931ee81c9f1b83797ecf3 /src/libw32dll | |
| parent | dcd884f37b2e3ff9f4607b90c117cad610ba4861 (diff) | |
| download | xine-lib-2de490e2847edaaa11e1ac1baefc5bcd6ebac2fb.tar.gz xine-lib-2de490e2847edaaa11e1ac1baefc5bcd6ebac2fb.tar.bz2 | |
Rationalise __attribute__((packed)) usage.
First of all, as we check the presence of the attribute in configure.ac and
we generate the XINE_PACKED definition there, there's no need to do the work
again on attributes.h.
Also remove #pragma pack support for now, as the trick is just not neat enough,
and as it is it's just noise.
Make Wine, libdvdnav and nosefart use XINE_PACKED rather than doing their own
checks, as they are less reliable.
Diffstat (limited to 'src/libw32dll')
| -rw-r--r-- | src/libw32dll/wine/windef.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libw32dll/wine/windef.h b/src/libw32dll/wine/windef.h index e7f691a02..b86f2f740 100644 --- a/src/libw32dll/wine/windef.h +++ b/src/libw32dll/wine/windef.h @@ -7,8 +7,9 @@ #ifndef __WINE_WINDEF_H #define __WINE_WINDEF_H +#include "config.h" + #ifdef __WINE__ -# include "config.h" # undef UNICODE #endif @@ -493,14 +494,14 @@ typedef LRESULT CALLBACK (*WNDPROC16)(HWND16,UINT16,WPARAM16,LPARAM); /* Macro for structure packing. */ +#define WINE_PACKED XINE_PACKED + #if defined(__GNUC__) || defined(__ICC) #ifndef _EGCS_ -#define WINE_PACKED __attribute__((packed)) #define WINE_UNUSED __attribute__((unused)) #define WINE_NORETURN __attribute__((noreturn)) #endif #else -#define WINE_PACKED /* nothing */ #define WINE_UNUSED /* nothing */ #define WINE_NORETURN /* nothing */ #endif |