summaryrefslogtreecommitdiff
path: root/hw/xwin
diff options
context:
space:
mode:
authorTiago Vignatti <tiago.vignatti@nokia.com>2010-07-16 20:19:50 +0300
committerTiago Vignatti <tiago.vignatti@nokia.com>2010-09-28 16:45:05 +0300
commitcbd4d5dbb70db62ba1cb79c7b904e6fa11f62d7e (patch)
treed949b9d89a19e5d07a81583c0b3a3d1d6ebb2ce2 /hw/xwin
parent58bd317e29f4abf7f950891339d2a6a78ddf7903 (diff)
xserver: delete pervasively use of DISPATCH_PROC
Some functions had to be moved around due some missing static definitions. Another minor clean up like inexistent function declarations and etc were made also. Part of this patch was cooked using: sed -i -e '/static DISPATCH_PROC*.*;/d' `git ls-files` Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Diffstat (limited to 'hw/xwin')
-rw-r--r--hw/xwin/InitInput.c6
-rw-r--r--hw/xwin/winclipboardinit.c2
-rwxr-xr-xhw/xwin/winclipboardwrappers.c6
-rwxr-xr-xhw/xwin/winwindowswm.c2
4 files changed, 7 insertions, 9 deletions
diff --git a/hw/xwin/InitInput.c b/hw/xwin/InitInput.c
index 705e618de..0ffa94092 100644
--- a/hw/xwin/InitInput.c
+++ b/hw/xwin/InitInput.c
@@ -39,9 +39,9 @@
*/
#ifdef XWIN_CLIPBOARD
-DISPATCH_PROC(winProcEstablishConnection);
-DISPATCH_PROC(winProcQueryTree);
-DISPATCH_PROC(winProcSetSelectionOwner);
+int winProcEstablishConnection(ClientPtr /* client */);
+int winProcQueryTree(ClientPtr /* client */);
+int winProcSetSelectionOwner(ClientPtr /* client */);
#endif
diff --git a/hw/xwin/winclipboardinit.c b/hw/xwin/winclipboardinit.c
index bec63ac8e..d74cd03e2 100644
--- a/hw/xwin/winclipboardinit.c
+++ b/hw/xwin/winclipboardinit.c
@@ -41,7 +41,7 @@
typedef int (*winDispatchProcPtr) (ClientPtr);
-DISPATCH_PROC(winProcSetSelectionOwner);
+int winProcSetSelectionOwner(ClientPtr /* client */);
/*
diff --git a/hw/xwin/winclipboardwrappers.c b/hw/xwin/winclipboardwrappers.c
index 658d050d2..bdacefba5 100755
--- a/hw/xwin/winclipboardwrappers.c
+++ b/hw/xwin/winclipboardwrappers.c
@@ -52,9 +52,9 @@
* Local function prototypes
*/
-DISPATCH_PROC(winProcEstablishConnection);
-DISPATCH_PROC(winProcQueryTree);
-DISPATCH_PROC(winProcSetSelectionOwner);
+int winProcEstablishConnection(ClientPtr /* client */);
+int winProcQueryTree(ClientPtr /* client */);
+int winProcSetSelectionOwner(ClientPtr /* client */);
/*
diff --git a/hw/xwin/winwindowswm.c b/hw/xwin/winwindowswm.c
index 34d7f4b5c..ca3dbc325 100755
--- a/hw/xwin/winwindowswm.c
+++ b/hw/xwin/winwindowswm.c
@@ -45,8 +45,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
static int WMErrorBase;
-static DISPATCH_PROC(ProcWindowsWMDispatch);
-static DISPATCH_PROC(SProcWindowsWMDispatch);
static unsigned char WMReqCode = 0;
static int WMEventBase = 0;