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.

1 files changed, 1 insertions, 24 deletions

diff --git a/src/xine-engine/alphablend.h b/src/xine-engine/alphablend.h
index 513ac116f..4fc879b2c 100644
--- a/src/xine-engine/alphablend.h
+++ b/src/xine-engine/alphablend.h
@@ -39,37 +39,14 @@ typedef struct {
 void _x_alphablend_init(alphablend_t *extra_data, xine_t *xine) XINE_PROTECTED;
 void _x_alphablend_free(alphablend_t *extra_data) XINE_PROTECTED;
 
-/* _MSC_VER port changes */
-#undef ATTRIBUTE_PACKED
-#undef PRAGMA_PACK_BEGIN 
-#undef PRAGMA_PACK_END
-
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) || defined(__ICC)
-#define ATTRIBUTE_PACKED __attribute__ ((packed))
-#define PRAGMA_PACK 0
-#endif
-
-#if !defined(ATTRIBUTE_PACKED)
-#define ATTRIBUTE_PACKED
-#define PRAGMA_PACK 1
-#endif
-
-#if PRAGMA_PACK
-#pragma pack(8)
-#endif
-
 typedef struct {         /* CLUT == Color LookUp Table */
   uint8_t cb;
   uint8_t cr;
   uint8_t y;
   uint8_t foo;
-} ATTRIBUTE_PACKED clut_t;
+} XINE_PACKED clut_t;
 
 
-#if PRAGMA_PACK
-#pragma pack()
-#endif
-
 #define XX44_PALETTE_SIZE 32
 
 typedef struct {