xfree86 merge

1 files changed, 1 insertions, 11 deletions

diff --git a/include/wire.h b/include/wire.h
index 428f767..f301f91 100644
--- a/include/wire.h
+++ b/include/wire.h
@@ -256,6 +256,7 @@ extern void WriteReqToServer(
 
 extern void _write_to_server(
     ClientPtr /*client*/,
+    Bool /*compressed*/,
     int /*len*/,
     char* /*buf*/,
     Bool /*checkLarge*/,
@@ -311,17 +312,6 @@ extern void SendAllocColor(
     CARD16    /* blue */
 );
 
-extern void SendAllocColor(
-#if NeedFunctionPrototypes
-    ClientPtr /* pClient */,
-    XID       /* cmap */,
-    CARD32    /* pixel */,
-    CARD16    /* red */,
-    CARD16    /* green */,
-    CARD16    /* blue */
-#endif
-);
-
 extern void SendGetModifierMapping(
     ClientPtr /*client*/
 );