summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--src/libw32dll/wine/pshpack1.h2
-rw-r--r--src/libw32dll/wine/pshpack2.h2
3 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 361f74287..b3714f36d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,8 @@ xine-lib (1.1.5) (Unreleased)
Patch by Reinhard Nissl.
* Fix support of block devices for AC3 and DTS demuxers. Thanks to Matthias
Kretz for the original patch.
+ * Portability fixes for Mac OS X, in particular Mac OS X on the new Intel
+ Macs. Thanks to Martin Aumueller and Emanuele Giaquinta.
xine-lib (1.1.4)
* Mark string-type configuration items according to whether they're plain
diff --git a/src/libw32dll/wine/pshpack1.h b/src/libw32dll/wine/pshpack1.h
index 659b2ed67..15876039c 100644
--- a/src/libw32dll/wine/pshpack1.h
+++ b/src/libw32dll/wine/pshpack1.h
@@ -2,7 +2,7 @@
#define __WINE_PSHPACK_H 1
#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__ICC)
-//#pragma pack(1)
+#pragma pack(1)
#elif !defined(RC_INVOKED)
#error "1 as alignment isn't supported by the compiler"
#endif /* defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) ; !defined(RC_INVOKED) */
diff --git a/src/libw32dll/wine/pshpack2.h b/src/libw32dll/wine/pshpack2.h
index a0830be0b..0145d8b13 100644
--- a/src/libw32dll/wine/pshpack2.h
+++ b/src/libw32dll/wine/pshpack2.h
@@ -2,7 +2,7 @@
#define __WINE_PSHPACK_H 2
#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__ICC)
-//#pragma pack(2)
+#pragma pack(2)
#elif !defined(RC_INVOKED)
#error "2 as alignment isn't supported by the compiler"
#endif /* defined(__GNUC__) || defined(__SUNPRO_CC) ; !defined(RC_INVOKED) */