Marcus Meissner : twain_32: Mark some functions static and other internal ones hidden.
Alexandre Julliard
julliard at winehq.org
Wed Apr 27 12:47:25 CDT 2011
Module: wine
Branch: master
Commit: 2c1d581cedb655f372ca4dc3e951c6adfb505746
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c1d581cedb655f372ca4dc3e951c6adfb505746
Author: Marcus Meissner <meissner at suse.de>
Date: Tue Apr 26 11:10:28 2011 +0200
twain_32: Mark some functions static and other internal ones hidden.
---
dlls/twain_32/dsm_ctrl.c | 4 ++++
dlls/twain_32/twain_i.h | 27 ++++++++++++---------------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c
index c34bd1d..b50dbc5 100644
--- a/dlls/twain_32/dsm_ctrl.c
+++ b/dlls/twain_32/dsm_ctrl.c
@@ -35,6 +35,10 @@
WINE_DEFAULT_DEBUG_CHANNEL(twain);
+static TW_UINT16 DSM_initialized; /* whether Source Manager is initialized */
+static TW_UINT32 DSM_sourceId; /* source id generator */
+static TW_UINT16 DSM_currentDevice; /* keep track of device during enumeration */
+
struct all_devices {
char *modname;
TW_IDENTITY identity;
diff --git a/dlls/twain_32/twain_i.h b/dlls/twain_32/twain_i.h
index ff777b6..ffe6bd9 100644
--- a/dlls/twain_32/twain_i.h
+++ b/dlls/twain_32/twain_i.h
@@ -39,32 +39,29 @@ typedef struct tagActiveDS
DSENTRYPROC dsEntry;
} activeDS;
-TW_UINT16 DSM_initialized; /* whether Source Manager is initialized */
-TW_UINT16 DSM_currentState; /* current state of Source Manager */
-TW_UINT16 DSM_twCC; /* current condition code of Source Manager */
-TW_UINT32 DSM_sourceId; /* source id generator */
-TW_UINT16 DSM_currentDevice; /* keep track of device during enumeration */
+TW_UINT16 DSM_currentState DECLSPEC_HIDDEN; /* current state of Source Manager */
+TW_UINT16 DSM_twCC DECLSPEC_HIDDEN; /* current condition code of Source Manager */
-activeDS *activeSources; /* list of active data sources */
+activeDS *activeSources DECLSPEC_HIDDEN; /* list of active data sources */
/* Implementation of operation triplets (From Application to Source Manager) */
extern TW_UINT16 TWAIN_CloseDS
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
extern TW_UINT16 TWAIN_IdentityGetDefault
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
extern TW_UINT16 TWAIN_IdentityGetFirst
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
extern TW_UINT16 TWAIN_IdentityGetNext
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
extern TW_UINT16 TWAIN_OpenDS
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
extern TW_UINT16 TWAIN_UserSelect
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
extern TW_UINT16 TWAIN_CloseDSM
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
extern TW_UINT16 TWAIN_OpenDSM
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
extern TW_UINT16 TWAIN_GetDSMStatus
- (pTW_IDENTITY pOrigin, TW_MEMREF pData);
+ (pTW_IDENTITY pOrigin, TW_MEMREF pData) DECLSPEC_HIDDEN;
#endif
More information about the wine-cvs
mailing list