XFree86 4.3.0.1xf86-4_3_0_1PRE_xf86-4_3_0_1

1 files changed, 24 insertions, 50 deletions

diff --git a/difs/tables.c b/difs/tables.c
index 29ba6b7..069523d 100644
--- a/difs/tables.c
+++ b/difs/tables.c
@@ -46,52 +46,26 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
+/* $XFree86: xc/programs/xfs/difs/tables.c,v 1.6 2001/12/14 20:01:35 dawes Exp $ */
 
-#include "globals.h"
-
-extern int  ProcInitialConnection(), ProcEstablishConnection();
-
-extern int  ProcSetAuthorization(),
-            ProcSetResolution(), ProcGetResolution(), ProcNoop(),
-            ProcListExtensions(), ProcQueryExtension(),
-            ProcListFonts(), ProcListFontsWithXInfo(),
-            ProcOpenBitmapFont(), ProcQueryXInfo(), ProcQueryXExtents(),
-            ProcQueryXBitmaps(), ProcCloseFont(),
-            ProcListCatalogues(), ProcSetCatalogues(), ProcGetCatalogues(),
-            ProcSetEventMask(), ProcGetEventMask(),
-            ProcCreateAC(), ProcFreeAC();
-
-extern int  SProcSimpleRequest(), SProcResourceRequest(),
-	    SProcListCatalogues(),
-            SProcSetResolution(),
-            SProcQueryExtension(),
-            SProcListFonts(), SProcListFontsWithXInfo(),
-            SProcOpenBitmapFont(), SProcQueryXExtents(),
-            SProcQueryXBitmaps(),
-            SProcCreateAC();
-
-extern void SErrorEvent();
-
-extern void NotImplemented(), SGenericReply(),
-            SListExtensionsReply(),
-	    SListCataloguesReply(),
-            SQueryExtensionReply(),
-            SListFontsReply(), SListFontsWithXInfoReply(),
-            SOpenBitmapFontReply(),
-            SQueryXInfoReply(), SQueryXExtentsReply(),
-            SQueryXBitmapsReply(),
-            SGetEventMaskReply(), SCreateACReply(), SGetResolutionReply(),
-            SOpenBitmapFontReply();
+#include <dispatch.h>
+#include <swaprep.h>
+#include <swapreq.h>
+#include <fsevents.h>
 
+#include "globals.h"
+#include "client.h"
+#include "extentst.h"
+#include "difs.h"
 
-int         (*InitialVector[3]) () =
+InitialFunc InitialVector[3] =
 {
     0,
     ProcInitialConnection,
     ProcEstablishConnection
 };
 
-int         (*ProcVector[NUM_PROC_VECTORS]) () =
+ProcFunc ProcVector[NUM_PROC_VECTORS] =
 {
     ProcNoop,			/* 0 */
     ProcListExtensions,
@@ -120,7 +94,7 @@ int         (*ProcVector[NUM_PROC_VECTORS]) () =
     0
 };
 
-int         (*SwappedProcVector[NUM_PROC_VECTORS]) () =
+SwappedProcFunc SwappedProcVector[NUM_PROC_VECTORS] =
 {
     SProcSimpleRequest,		/* 0 */
     SProcSimpleRequest,
@@ -149,10 +123,10 @@ int         (*SwappedProcVector[NUM_PROC_VECTORS]) () =
     0
 };
 
-void        (*EventSwapVector[NUM_EVENT_VECTORS]) () =
+EventSwapFunc EventSwapVector[NUM_EVENT_VECTORS] =
 {
     SErrorEvent,
-    NotImplemented,
+    (EventSwapFunc)NotImplemented,
     0,
     0,
     0,
@@ -161,20 +135,20 @@ void        (*EventSwapVector[NUM_EVENT_VECTORS]) () =
     0
 };
 
-void        (*ReplySwapVector[NUM_PROC_VECTORS]) () =
+ReplySwapFunc ReplySwapVector[NUM_PROC_VECTORS] =
 {
-    NotImplemented,		/* NoOp */
+    (ReplySwapFunc)NotImplemented,		/* NoOp */
     SListExtensionsReply,
     SQueryExtensionReply,	/* SQueryExtensionReply */
     SListCataloguesReply,
-    NotImplemented,		/* SetCatalogues */
+    (ReplySwapFunc)NotImplemented,		/* SetCatalogues */
     SGenericReply,		/* GetCatalogues */
-    NotImplemented,		/* SetEventMask */
+    (ReplySwapFunc)NotImplemented,		/* SetEventMask */
     SGetEventMaskReply,
     SCreateACReply,
-    NotImplemented,		/* FreeAC */
-    NotImplemented,		/* SetAuthorization - 10 */
-    NotImplemented,		/* SetResolution */
+    (ReplySwapFunc)NotImplemented,		/* FreeAC */
+    (ReplySwapFunc)NotImplemented,		/* SetAuthorization - 10 */
+    (ReplySwapFunc)NotImplemented,		/* SetResolution */
     SGetResolutionReply,
     SListFontsReply,
     SListFontsWithXInfoReply,
@@ -184,7 +158,7 @@ void        (*ReplySwapVector[NUM_PROC_VECTORS]) () =
     SQueryXExtentsReply,
     SQueryXBitmapsReply,
     SQueryXBitmapsReply,	/* 20 */
-    NotImplemented,		/* Close */
-    NotImplemented,
-    NotImplemented
+    (ReplySwapFunc)NotImplemented,		/* Close */
+    (ReplySwapFunc)NotImplemented,
+    (ReplySwapFunc)NotImplemented
 };