For some reason nav_types.h has exactly the same preprocessor directives that ifo_types.h has and it includes ifo_types.h.
This patch removes the duplicates. E -- Erik Hovland mail: [EMAIL PROTECTED] web: http://hovland.org/ PGP/GPG public key available on request
Remove duplicate code in the two header files. From: Erik Hovland <[EMAIL PROTECTED]> --- src/nav_types.h | 26 +------------------------- 1 files changed, 1 insertions(+), 25 deletions(-) diff --git a/src/nav_types.h b/src/nav_types.h index cadcdeb..618ee09 100644 --- a/src/nav_types.h +++ b/src/nav_types.h @@ -32,24 +32,6 @@ #include <inttypes.h> #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 @@ -57,15 +39,9 @@ #define PS2_PCI_SUBSTREAM_ID 0x00 #define PS2_DSI_SUBSTREAM_ID 0x01 -/* Remove this */ +/* XXX: Remove this */ #define DSI_START_BYTE 1031 - -#if PRAGMA_PACK -#pragma pack(1) -#endif - - /** * PCI General Information */
_______________________________________________ DVDnav-discuss mailing list [email protected] https://lists.mplayerhq.hu/mailman/listinfo/dvdnav-discuss
