[vlc-commits] include/vlc_codecs.h: added pack(pop) counterpart to pack(push) for certain apple platforms

Felix Paul Kühne git at videolan.org
Tue Mar 27 18:13:15 CEST 2012


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Mar 27 17:56:42 2012 +0200| [300f09268698b65727e1887e2cfbc72e0447564f] | committer: Felix Paul Kühne

include/vlc_codecs.h: added pack(pop) counterpart to pack(push) for certain apple platforms

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

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

diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h
index d78f006..9e5979c 100644
--- a/include/vlc_codecs.h
+++ b/include/vlc_codecs.h
@@ -208,8 +208,10 @@ ATTR_PACKED
 } VIDEOINFO;
 #endif
 
-#if defined(__SUNPRO_C) || (defined(__APPLE__) && !HAVE_ATTRIBUTE_PACKED)
+#if defined(__SUNPRO_C)
 #   pragma pack()
+#elif defined(__APPLE__) && !HAVE_ATTRIBUTE_PACKED
+#   pragma pack(pop)
 #endif
 
 /* WAVE format wFormatTag IDs */



More information about the vlc-commits mailing list