[PATCH 05/12] Cygwin/X: Place prototype for winSelectIcons() in a .h file

Jon TURNEY jon.turney at dronecode.org.uk
Wed Feb 4 05:11:27 PST 2009


Fixes warning as prototype is now in scope for the definition

Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
---
 hw/xwin/win.h                  |    2 ++
 hw/xwin/winmultiwindowwindow.c |    2 --
 hw/xwin/winwin32rootless.c     |    3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index 32d3b02..8005d5b 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -1218,6 +1218,8 @@ winSetShapeRootless (WindowPtr pWindow);
 HICON
 winXIconToHICON (WindowPtr pWin, int iconSize);
 
+void
+winSelectIcons(WindowPtr pWin, HICON *pIcon, HICON *pSmallIcon);
 
 #ifdef XWIN_MULTIWINDOW
 /*
diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index 18dba23..f4f61a8 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -46,8 +46,6 @@
 
 extern HWND			g_hDlgDepthChange;
 
-extern void winSelectIcons(WindowPtr pWin, HICON *pIcon, HICON *pSmallIcon);
-
 /*
  * Prototypes for local functions
  */
diff --git a/hw/xwin/winwin32rootless.c b/hw/xwin/winwin32rootless.c
index 26d5977..a17c219 100755
--- a/hw/xwin/winwin32rootless.c
+++ b/hw/xwin/winwin32rootless.c
@@ -74,9 +74,6 @@ winMWExtWMSetNativeProperty (RootlessWindowPtr pFrame);
 
 Bool			g_fNoConfigureWindow = FALSE;
 
-
-extern void winSelectIcons(WindowPtr pWin, HICON *pIcon, HICON *pSmallIcon);
-
 /*
  * Internal function to get the DIB format that is compatible with the screen
  * Fixme: Share code with winshadgdi.c
-- 
1.6.0.4




More information about the xorg mailing list