INTEGRATION: CWS mingwport06 (1.1.106); FILE MERGED

2007/08/27 14:40:03 vg 1.1.106.1: #i75499# pragma for MSVC

twain/inc/twain.h

@@ -76,7 +76,9 @@
 /*  Force 32-bit twain to use same packing of twain structures as existing */
 /*  16-bit twain.  This allows 16/32-bit thunking.                         */
 #ifdef  WIN32
-    #ifdef __BORLANDC__ //(Mentor June 13, 1996) if using a Borland compiler
+    #ifdef __MINGW32__
+        #pragma pack (push, 2)
+    #elif __BORLANDC__ //(Mentor June 13, 1996) if using a Borland compiler
         #pragma option -a2  //(Mentor June 13, 1996) switch to word alignment
     #else   //(Mentor June 13, 1996) if we're using some other compiler
         #pragma pack (push, before_twain)
@@ -1958,7 +1960,9 @@ typedef TW_UINT16 (*DSENTRYPROC)(pTW_IDENTITY,
 /*  Force 32-bit twain to use same packing of twain structures as existing */
 /*  16-bit twain.  This allows 16/32-bit thunking. */
 #ifdef  WIN32
-    #ifdef __BORLANDC__ //(Mentor June 13, 1996) if we're using a Borland compiler
+    #ifdef __MINGW32__
+        #pragma pack (pop)
+    #elif __BORLANDC__ //(Mentor June 13, 1996) if we're using a Borland compiler
         #pragma option -a.  //(Mentor October 30, 1996) switch back to original alignment
     #else   //(Mentor June 13, 1996) if NOT using a Borland compiler
         #pragma pack (pop, before_twain)