[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/khtml/misc
From:       Adriaan de Groot <groot () kde ! org>
Date:       2010-09-09 13:14:17
Message-ID: 20100909131417.32319AC884 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1173470 by adridg:

Do not use gcc-specific extensions to #pragma pack when not using gcc

 M  +9 -1      woff-private.h  


--- trunk/KDE/kdelibs/khtml/misc/woff-private.h #1173469:1173470
@@ -56,7 +56,11 @@
 #  define READ32BE(x) ((READ16BE((x) & 0xffff) << 16) | (READ16BE((x) >> 16)))
 # endif
 
-#pragma pack(push,1)
+#if defined(__SUNPRO_CC)
+#pragma pack(1) /* no pragma stack in Sun Studio */
+#else
+#pragma pack(push,1) /* assume this is GCC compatible */
+#endif
 
 typedef struct {
   quint32 version;
@@ -125,6 +129,10 @@
   quint16 newIndex;
 } tableOrderRec;
 
+#if defined(__SUNPRO_CC)
+#pragma pack()
+#else
 #pragma pack(pop)
+#endif
 
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]