Commit 1de44b7c authored by Francois Cartegnie's avatar Francois Cartegnie Committed by Rémi Denis-Courmont

Use pragma packing for suncc

Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
parent e4393c59
...@@ -30,12 +30,6 @@ ...@@ -30,12 +30,6 @@
* This file defines codec related structures needed by the demuxers and decoders * 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 */ /* Structures exported to the demuxers and decoders */
#if !(defined _GUID_DEFINED || defined GUID_DEFINED) #if !(defined _GUID_DEFINED || defined GUID_DEFINED)
...@@ -49,6 +43,15 @@ typedef struct _GUID ...@@ -49,6 +43,15 @@ typedef struct _GUID
} GUID, *REFGUID, *LPGUID; } 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_ #ifndef _WAVEFORMATEX_
#define _WAVEFORMATEX_ #define _WAVEFORMATEX_
typedef struct typedef struct
...@@ -199,6 +202,10 @@ ATTR_PACKED ...@@ -199,6 +202,10 @@ ATTR_PACKED
} VIDEOINFO; } VIDEOINFO;
#endif #endif
#if defined(__SUNPRO_C)
# pragma pack()
#endif
/* WAVE format wFormatTag IDs */ /* WAVE format wFormatTag IDs */
#define WAVE_FORMAT_UNKNOWN 0x0000 /* Microsoft Corporation */ #define WAVE_FORMAT_UNKNOWN 0x0000 /* Microsoft Corporation */
#define WAVE_FORMAT_PCM 0x0001 /* Microsoft Corporation */ #define WAVE_FORMAT_PCM 0x0001 /* Microsoft Corporation */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment