# HG changeset patch # User nicodvb # Date 1216967127 0 # Node ID b91b7ea30fd3596b6c79b0f02d9ef13486bc0fdb # Parent 4e610984cc3fa4f61766be11190b97afbd2f6955 removed duplicated #pragma directives and definitions; patch by Erik Hovland diff -r 4e610984cc3f -r b91b7ea30fd3 nav_types.h --- a/nav_types.h Thu Jul 24 22:03:06 2008 +0000 +++ b/nav_types.h Fri Jul 25 06:25:27 2008 +0000 @@ -32,24 +32,6 @@ #include #include "ifo_types.h" /* only dvd_time_t, vm_cmd_t and user_ops_t */ - -#undef ATTRIBUTE_PACKED -#undef PRAGMA_PACK_BEGIN -#undef PRAGMA_PACK_END - -#if defined(__GNUC__) -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) -#define ATTRIBUTE_PACKED __attribute__ ((packed)) -#define PRAGMA_PACK 0 -#endif -#endif - -#if !defined(ATTRIBUTE_PACKED) -#define ATTRIBUTE_PACKED -#define PRAGMA_PACK 1 -#endif - - /* The length including the substream id byte. */ #define PCI_BYTES 0x3d4 #define DSI_BYTES 0x3fa @@ -60,12 +42,6 @@ /* Remove this */ #define DSI_START_BYTE 1031 - -#if PRAGMA_PACK -#pragma pack(1) -#endif - - /** * PCI General Information */