diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-09-06 13:23:02 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-09-06 13:23:02 +0000 |
| commit | 5e81edb0bb551ae3d84492c902f8e8305e830747 (patch) | |
| tree | 69c9164e84e54228379950f79753130882efc875 /twain | |
| parent | 1259a2a9fe566ec479f54f031b8ac54a416a8e32 (diff) | |
INTEGRATION: CWS mingwport06 (1.1.106); FILE MERGED
2007/08/27 14:40:03 vg 1.1.106.1: #i75499# pragma for MSVC
Diffstat (limited to 'twain')
| -rw-r--r-- | twain/inc/twain.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/twain/inc/twain.h b/twain/inc/twain.h index 53203cf3e020..a9643e6111f9 100644 --- a/twain/inc/twain.h +++ b/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) |