xserver: Branch 'master'

[Greg Kroah-Hartman]

 XTrap/xtrapdiswp.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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

    fix compiler warnings in XTrap/xtrapdiswp.c

diff --git a/XTrap/xtrapdiswp.c b/XTrap/xtrapdiswp.c
index b0fa439..dc2a338 100644
--- a/XTrap/xtrapdiswp.c
+++ b/XTrap/xtrapdiswp.c
@@ -374,13 +374,13 @@ void XETSwSendEvent(register xSendEventR
 {
     register char n;
     xEvent eventT;
-    void (*proc)();
+    EventSwapPtr proc;
     swapl(&(data->destination), n);
     swapl(&(data->eventMask), n);
 
     /* Swap event */
     proc = EventSwapVector[data->event.u.u.type & 0177];
-    if (!proc || (int (*)()) proc == (int (*)()) NotImplemented)   
+    if (!proc || proc == NotImplemented)
         (*proc)(&(data->event), &eventT);
     data->event = eventT;
     swaps(&(data->length), n);