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/libxineadec/nosefart/diff_to_nosefart_cvs.patch | |
| 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/libxineadec/nosefart/diff_to_nosefart_cvs.patch')
| -rw-r--r-- | src/libxineadec/nosefart/diff_to_nosefart_cvs.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/src/libxineadec/nosefart/diff_to_nosefart_cvs.patch b/src/libxineadec/nosefart/diff_to_nosefart_cvs.patch index 280cd89cb..2b6202fb8 100644 --- a/src/libxineadec/nosefart/diff_to_nosefart_cvs.patch +++ b/src/libxineadec/nosefart/diff_to_nosefart_cvs.patch @@ -73,3 +73,45 @@ diff -u -p -r1.1.1.1 nes_apu.c } /* resync cycle counter */ +--- a/src/libxineadec/nosefart/nsf.h Tue Apr 10 13:42:00 2007 +0200 ++++ b/src/libxineadec/nosefart/nsf.h Tue Apr 10 13:48:50 2007 +0200 +@@ -29,6 +29,8 @@ + #include "osd.h" + #include "nes6502.h" + #include "nes_apu.h" ++ ++#include "config.h" + + #define NSF_MAGIC "NESM\x1A" + +@@ -96,7 +98,7 @@ typedef struct nsf_s + + /* our main processing routine, calls all external mixing routines */ + void (*process)(void *buffer, int num_samples); +-} __PACKED__ nsf_t; ++} XINE_PACKED nsf_t; + + /* Function prototypes */ + extern void nsf_init(void); +--- a/src/libxineadec/nosefart/osd.h Tue Apr 10 13:42:00 2007 +0200 ++++ b/src/libxineadec/nosefart/osd.h Tue Apr 10 13:19:34 2007 +0200 +@@ -26,19 +26,15 @@ + #ifndef _OSD_H_ + #define _OSD_H_ + +- + #if defined(__GNUC__) || defined(__ICC) +-#define __PACKED__ __attribute__ ((packed)) + #define PATH_SEP '/' + #ifdef __DJGPP__ + #include <dpmi.h> + #include "dos_ints.h" + #endif + #elif defined(WIN32) +-#define __PACKED__ + #define PATH_SEP '\\' + #else /* crapintosh? */ +-#define __PACKED__ + #define PATH_SEP ':' + #endif + |