From 5e896e425fe14022b0714301531bd54151c763f0 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Thu, 14 Oct 2010 22:43:51 +0100 Subject: [PATCH] Cygwin/X: Make g_hmodCommonControls static Make g_hmodCommonControls static, it's only used in InitOutput.c Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison --- hw/xwin/InitOutput.c | 7 ++++++- hw/xwin/win.h | 1 - hw/xwin/winglobals.c | 2 -- 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,12 +90,17 @@ 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;