xserver: Branch 'master'

[Greg Kroah-Hartman]

 XTrap/xtrapdi.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

New commits:
diff-tree 4d258f31967141e3c4a6e4abbef89ffa717e85aa (from 870cecb72c2cba44dc64cb202917453603c8f287)
Author: Greg Kroah-Hartman <gregkh at suse.de>
Date:   Mon Jun 19 11:27:47 2006 -0700

    fix compiler warnings in XTrap/xtrapdi.c

diff --git a/XTrap/xtrapdi.c b/XTrap/xtrapdi.c
index 26da8cb..1c4f5ca 100644
--- a/XTrap/xtrapdi.c
+++ b/XTrap/xtrapdi.c
@@ -170,7 +170,7 @@ static ClientList cmd_clients;   /* Link
 /*----------------------------*
  *  Forward Declarations
  *----------------------------*/
-static void _SwapProc (int (**f1 )(), int (**f2 )());
+static void _SwapProc (int (**f1 )(void), int (**f2 )(void));
 static void sXETrapEvent (xETrapDataEvent *from , xETrapDataEvent *to );
 static int add_accelerator_node (ClientPtr client , ClientList *accel );
 static void remove_accelerator_node (ClientPtr client , ClientList *accel );
@@ -886,14 +886,14 @@ int XETrapConfig(xXTrapConfigReq *reques
                 {   /* Client wants the XTrap rtn */
                     if (++(vectored_requests[i]) <= 1L)
                     {   /* first client, so do it */
-                        _SwapProc(&(XETrapProcVector[i]), &(ProcVector[i]));
+                        _SwapProc(&(XETrapProcVector[i]), (int_function *)&(ProcVector[i]));
                     }
                 }
                 else
                 {   /* Client wants the *real* rtn */
                     if (--(vectored_requests[i]) <= 0L)
                     {   /* No more clients using, so do it */
-                        _SwapProc(&(XETrapProcVector[i]), &(ProcVector[i]));
+                        _SwapProc(&(XETrapProcVector[i]), (int_function *)&(ProcVector[i]));
                     }
                 }
                 if (status == Success)
@@ -1787,9 +1787,9 @@ static void update_protocol(xXTrapGetReq
  * lint from complaining about mixed types. It seems to work, but I would
  * probably classify this as a hack.
  */
-static void _SwapProc( register int (**f1)(), register int (**f2)())
+static void _SwapProc( register int (**f1)(void), register int (**f2)(void))
 {
-    register int (*t1)() = *f1;
+    register int (*t1)(void) = *f1;
     *f1 = *f2;
     *f2 = t1;