[vlc-commits] include/vlc_codecs.h: added support for Apple platforms in case HAVE_ATTRIBUTE_PACKED isn' t enabled

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Mar 27 17:44:31 2012 +0200| [ab6a11a2a3efcb13176365e26d1bd0b0af21a852] | committer: Felix Paul Kühne

include/vlc_codecs.h: added support for Apple platforms in case HAVE_ATTRIBUTE_PACKED isn't enabled

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ab6a11a2a3efcb13176365e26d1bd0b0af21a852
---

 include/vlc_codecs.h |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h
index 8798603..d78f006 100644
--- a/include/vlc_codecs.h
+++ b/include/vlc_codecs.h
@@ -50,6 +50,9 @@ typedef GUID guid_t;
 #elif defined(__SUNPRO_C)
 #   pragma pack(1)
 #   define ATTR_PACKED
+#elif defined(__APPLE__)
+#   pragma pack(push, 1)
+#   define ATTR_PACKED
 #else
 #   error FIXME
 #endif
@@ -205,7 +208,7 @@ ATTR_PACKED
 } VIDEOINFO;
 #endif
 
-#if defined(__SUNPRO_C)
+#if defined(__SUNPRO_C) || (defined(__APPLE__) && !HAVE_ATTRIBUTE_PACKED)
 #   pragma pack()
 #endif