summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2010-10-14 22:43:51 +0100
committerJon TURNEY <jon.turney@dronecode.org.uk>2010-10-19 15:01:56 +0100
commit5e896e425fe14022b0714301531bd54151c763f0 (patch)
tree46e735e61361e1f69d79d1c45b9532fddf205ccb
parent49b996faadf0fedcee25d4a8f96f4c4007c29f5f (diff)
Cygwin/X: Make g_hmodCommonControls static
Make g_hmodCommonControls static, it's only used in InitOutput.c Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
-rw-r--r--hw/xwin/InitOutput.c7
-rw-r--r--hw/xwin/win.h1
-rw-r--r--hw/xwin/winglobals.c2
3 files changed, 6 insertions, 4 deletions
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index 63fca3abb..ae1d4154b 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -90,13 +90,18 @@ extern HWND g_hwndClipboard;
extern Bool g_fClipboard;
#endif
-extern HMODULE g_hmodCommonControls;
+
extern FARPROC g_fpTrackMouseEvent;
extern Bool g_fNoHelpMessageBox;
extern Bool g_fSilentDupError;
extern Bool g_fNativeGl;
/*
+ module handle for dynamically loaded comctl32 library
+*/
+static HMODULE g_hmodCommonControls = NULL;
+
+/*
* Function prototypes
*/
diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index f197def56..4d6771ca5 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -656,7 +656,6 @@ extern DeviceIntPtr g_pwinKeyboard;
extern FARPROC g_fpDirectDrawCreate;
extern FARPROC g_fpDirectDrawCreateClipper;
-extern HMODULE g_hmodCommonControls;
extern FARPROC g_fpTrackMouseEvent;
diff --git a/hw/xwin/winglobals.c b/hw/xwin/winglobals.c
index da1712988..d7ea2e39a 100644
--- a/hw/xwin/winglobals.c
+++ b/hw/xwin/winglobals.c
@@ -83,8 +83,6 @@ Bool g_fNativeGl = FALSE;
* Global variables for dynamically loaded libraries and
* their function pointers
*/
-
-HMODULE g_hmodCommonControls = NULL;
FARPROC g_fpTrackMouseEvent = (FARPROC) (void (*)(void))NoopDDA;