incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1196080 - /incubator/ooo/trunk/main/twain/inc/twain.h
Date Tue, 01 Nov 2011 16:09:40 GMT
Author: pfg
Date: Tue Nov  1 16:09:40 2011
New Revision: 1196080

URL: http://svn.apache.org/viewvc?rev=1196080&view=rev
Log:
Fix issue with twain header. Thanks to arielch@

Modified:
    incubator/ooo/trunk/main/twain/inc/twain.h

Modified: incubator/ooo/trunk/main/twain/inc/twain.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/twain/inc/twain.h?rev=1196080&r1=1196079&r2=1196080&view=diff
==============================================================================
--- incubator/ooo/trunk/main/twain/inc/twain.h (original)
+++ incubator/ooo/trunk/main/twain/inc/twain.h Tue Nov  1 16:09:40 2011
@@ -181,9 +181,9 @@
 
 
 /* Set the packing: this occurs before any structures are defined */
-#ifdef defined(TWH_CMP_MING32)
+#if defined(TWH_CMP_MING32)
     #pragma pack (push, 2)
-#elif TWH_CMP_MSC
+#elif defined(TWH_CMP_MSC)
     #pragma pack (push, before_twain)
     #pragma pack (2)
 #elif defined(TWH_CMP_GNU)
@@ -2184,9 +2184,9 @@ typedef struct {
 } TW_ENTRYPOINT, FAR * pTW_ENTRYPOINT;
 
 /* Restore the previous packing alignment: this occurs after all structures are defined */
-#ifdef defined(TWH_CMP_MING32)
+#if defined(TWH_CMP_MING32)
     #pragma pack (pop)
-#elif TWH_CMP_MSC
+#elif defined(TWH_CMP_MSC)
     #pragma pack (pop, before_twain)
 #elif defined(TWH_CMP_GNU)
     #pragma pack (pop, before_twain)



Mime
View raw message