summaryrefslogtreecommitdiff
path: root/Xext/shape.c
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2004-07-29 23:43:40 +0000
committerKevin E Martin <kem@kem.org>2004-07-29 23:43:40 +0000
commit813d75f9d3c7b540977926e37310fa683daf12e1 (patch)
tree00c2764950a672f62f4919fe57d5d613b325feb7 /Xext/shape.c
parent274d5044ac41523ff23912c223177c429c710e09 (diff)
Use LibraryTargetName when not building a loadable server
Move extern function declarations to window.h Cleaned up code since client's saveSet is no longer defined as a pointer* Added externs back in Change #if to #ifdef to fix compiler warning Add function declarations that were inadvertently removed by previous check in Disable extensions that are not (yet) supported by DMX
Diffstat (limited to 'Xext/shape.c')
-rw-r--r--Xext/shape.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/Xext/shape.c b/Xext/shape.c
index c5dfe78fb..91758a1e4 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.2 2004/04/23 18:44:41 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.3 2004/07/29 18:46:37 stukreit Exp $ */
/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.18 2003/10/28 23:08:43 tsi Exp $ */
/************************************************************
@@ -61,10 +61,6 @@ static int ShapeFreeEvents(
pointer /* data */,
XID /* id */
);
-void SendShapeNotify(
- WindowPtr /* pWin */,
- int /* which */
- );
static void ShapeResetProc(
ExtensionEntry * /* extEntry */
);
@@ -85,12 +81,9 @@ RegionOperate (
CreateDftPtr /* create */
);
-#define CREATE_PROC(func) RegionPtr func(WindowPtr /* pWin */)
-
-CREATE_PROC(CreateBoundingShape);
-CREATE_PROC(CreateClipShape);
-
-#undef CREATE_PROC
+/* SendShapeNotify, CreateBoundingShape and CreateClipShape are used
+ * externally by the Xfixes extension and are now defined in window.h
+ */
static DISPATCH_PROC(ProcShapeCombine);
static DISPATCH_PROC(ProcShapeDispatch);