Alexandre Julliard : include: Avoid redefinition of WIN32 in twain.h.
Alexandre Julliard
julliard at winehq.org
Thu Feb 19 09:18:44 CST 2009
Module: wine
Branch: master
Commit: 5d513c1b0422f87e69f6db4dabf1ef4f20608059
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d513c1b0422f87e69f6db4dabf1ef4f20608059
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Feb 19 13:06:35 2009 +0100
include: Avoid redefinition of WIN32 in twain.h.
---
include/twain.h | 35 +++++++----------------------------
1 files changed, 7 insertions(+), 28 deletions(-)
diff --git a/include/twain.h b/include/twain.h
index a7ff0f0..bdbda47 100644
--- a/include/twain.h
+++ b/include/twain.h
@@ -62,11 +62,6 @@
#undef FAR
#define FAR
-#define huge
-#define WIN32
-#define _WIN32
-#undef __declspec
-#define __declspec(spec)
/****************************************************************************
* TWAIN Version *
@@ -86,16 +81,8 @@
#ifdef _MSWIN_
typedef HANDLE TW_HANDLE;
typedef LPVOID TW_MEMREF;
-
- /* SDH - 05/05/95 - TWUNK */
- /* For common code between 16 and 32 bits. */
-# ifdef WIN32
-# define TW_HUGE
-# else /* WIN32 */
-# define TW_HUGE huge
-# endif /* WIN32 */
- typedef BYTE TW_HUGE * HPBYTE;
- typedef void TW_HUGE * HPVOID;
+ typedef BYTE * HPBYTE;
+ typedef void * HPVOID;
#endif /* _MSWIN_ */
#ifdef _MAC_
@@ -1830,19 +1817,11 @@ typedef TW_UINT16 (*DSMENTRYPROC)(pTW_IDENTITY, pTW_IDENTITY,
extern "C" {
#endif /* __cplusplus */
#ifdef _MSWIN_
-# ifdef _WIN32
- __declspec(dllexport) TW_UINT16 FAR PASCAL DS_Entry (pTW_IDENTITY pOrigin,
- TW_UINT32 DG,
- TW_UINT16 DAT,
- TW_UINT16 MSG,
- TW_MEMREF pData);
-# else /* _WIN32 */
- TW_UINT16 FAR PASCAL DS_Entry (pTW_IDENTITY pOrigin,
- TW_UINT32 DG,
- TW_UINT16 DAT,
- TW_UINT16 MSG,
- TW_MEMREF pData);
-# endif /* _WIN32 */
+ TW_UINT16 DECLSPEC_EXPORT PASCAL DS_Entry (pTW_IDENTITY pOrigin,
+ TW_UINT32 DG,
+ TW_UINT16 DAT,
+ TW_UINT16 MSG,
+ TW_MEMREF pData);
typedef TW_UINT16 (FAR PASCAL *DSENTRYPROC) (pTW_IDENTITY pOrigin,
TW_UINT32 DG,
More information about the wine-cvs
mailing list