[vlc-devel] [PATCH 8/8] Use pragma packing for suncc

[Francois Cartegnie]

---
 include/vlc_codecs.h |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h
index 14d7af4..806d847 100644
--- a/include/vlc_codecs.h
+++ b/include/vlc_codecs.h
@@ -30,12 +30,6 @@
  * This file defines codec related structures needed by the demuxers and decoders
  */
 
-#ifdef HAVE_ATTRIBUTE_PACKED
-#   define ATTR_PACKED __attribute__((__packed__))
-#else
-#   error FIXME
-#endif
-
 /* Structures exported to the demuxers and decoders */
 
 #if !(defined _GUID_DEFINED || defined GUID_DEFINED)
@@ -47,7 +41,16 @@ typedef struct _GUID
     uint16_t Data3;
     uint8_t  Data4[8];
 } GUID, *REFGUID, *LPGUID;
-#endif /* GUID_DEFINED */
+#endif /* GUID_DEFINED */ 
+
+#ifdef HAVE_ATTRIBUTE_PACKED
+#   define ATTR_PACKED __attribute__((__packed__))
+#elif defined(__SUNPRO_C)
+#   pragma pack(1)
+#   define ATTR_PACKED
+#else
+#   error FIXME
+#endif
 
 #ifndef _WAVEFORMATEX_
 #define _WAVEFORMATEX_
@@ -199,6 +202,10 @@ ATTR_PACKED
 } VIDEOINFO;
 #endif
 
+#if defined(__SUNPRO_C)
+#   pragma pack()
+#endif
+
 /* WAVE format wFormatTag IDs */
 #define WAVE_FORMAT_UNKNOWN             0x0000 /* Microsoft Corporation */
 #define WAVE_FORMAT_PCM                 0x0001 /* Microsoft Corporation */
-- 
1.6.3