From 3e8269177ee01fe107830032b60a8d311d4b4b0e Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Wed, 25 Jan 2012 17:08:17 +0000 Subject: [PATCH] hw/xwin: Fix redundant declarations in winclipboardwrappers.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix redundant declarations in winclipboardwrappers.c. Also remove obsolete winProcQueryTree() prototype. winclipboardwrappers.c:64:12: error: redundant redeclaration of ‘g_iNumScreens’ winglobals.h:33:12: note: previous declaration of ‘g_iNumScreens’ was here winclipboardwrappers.c:67:13: error: redundant redeclaration of ‘g_fXdmcpEnabled’ winglobals.h:45:13: note: previous declaration of ‘g_fXdmcpEnabled’ was here winclipboardwrappers.c:75:27: error: redundant redeclaration of ‘winProcEstablishConnectionOrig’ winglobals.h:66:27: note: previous declaration of ‘winProcEstablishConnectionOrig’ was here winclipboardwrappers.c:76:27: error: redundant redeclaration of ‘winProcQueryTreeOrig’ winglobals.h:67:27: note: previous declaration of ‘winProcQueryTreeOrig’ was here winclipboardwrappers.c:77:27: error: redundant redeclaration of ‘winProcSetSelectionOwnerOrig’ winglobals.h:68:27: note: previous declaration of ‘winProcSetSelectionOwnerOrig’ was here winclipboardwrappers.c:56:5: warning: redundant redeclaration of ‘winProcEstablishConnection’ [-Wredundant-decls] winclipboardwrappers.c:52:5: note: previous declaration of ‘winProcEstablishConnection’ was here winclipboardwrappers.c:57:5: warning: redundant redeclaration of ‘winProcSetSelectionOwner’ [-Wredundant-decls] winclipboardwrappers.c:54:5: note: previous declaration of ‘winProcSetSelectionOwner’ was here Signed-off-by: Jon TURNEY Reviewed-by: Colin Harrison --- hw/xwin/winclipboardwrappers.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/hw/xwin/winclipboardwrappers.c b/hw/xwin/winclipboardwrappers.c index 1118f4ff8..008088b6a 100644 --- a/hw/xwin/winclipboardwrappers.c +++ b/hw/xwin/winclipboardwrappers.c @@ -49,10 +49,6 @@ * Local function prototypes */ -int winProcEstablishConnection(ClientPtr /* client */ ); -int winProcQueryTree(ClientPtr /* client */ ); -int winProcSetSelectionOwner(ClientPtr /* client */ ); - DISPATCH_PROC(winProcEstablishConnection); DISPATCH_PROC(winProcSetSelectionOwner); @@ -60,10 +56,8 @@ DISPATCH_PROC(winProcSetSelectionOwner); * References to external symbols */ -extern int g_iNumScreens; extern unsigned int g_uiAuthDataLen; extern char *g_pAuthData; -extern Bool g_fXdmcpEnabled; extern Bool g_fClipboardLaunched; extern Bool g_fClipboardStarted; extern Bool g_fClipboard; @@ -71,9 +65,6 @@ extern Window g_iClipboardWindow; extern Atom g_atomLastOwnedSelection; extern HWND g_hwndClipboard; -extern winDispatchProcPtr winProcEstablishConnectionOrig; -extern winDispatchProcPtr winProcQueryTreeOrig; -extern winDispatchProcPtr winProcSetSelectionOwnerOrig; /* * Wrapper for internal EstablishConnection function.