From 406c49eb810cbdcfd833cac4eeaa465598238691 Mon Sep 17 00:00:00 2001 From: Stuart Kreitman Date: Thu, 29 Jul 2004 18:46:37 +0000 Subject: Integration of DAMAGE-XFIXES branch to trunk https://freedesktop.org/bugzilla/show_bug.cgi?id=859 DAMAGE calls some shape functions. Modified Files: Imakefile shape.c --- Xext/shape.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Xext') diff --git a/Xext/shape.c b/Xext/shape.c index 8f5c3dba0..c5dfe78fb 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -1,4 +1,4 @@ -/* $XdotOrg$ */ +/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.2 2004/04/23 18:44:41 eich Exp $ */ /* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.18 2003/10/28 23:08:43 tsi Exp $ */ /************************************************************ @@ -61,7 +61,7 @@ static int ShapeFreeEvents( pointer /* data */, XID /* id */ ); -static void SendShapeNotify( +void SendShapeNotify( WindowPtr /* pWin */, int /* which */ ); @@ -87,8 +87,8 @@ RegionOperate ( #define CREATE_PROC(func) RegionPtr func(WindowPtr /* pWin */) -static CREATE_PROC(CreateBoundingShape); -static CREATE_PROC(CreateClipShape); +CREATE_PROC(CreateBoundingShape); +CREATE_PROC(CreateClipShape); #undef CREATE_PROC @@ -261,7 +261,7 @@ RegionOperate (client, pWin, kind, destRgnp, srcRgn, op, xoff, yoff, create) return Success; } -static RegionPtr +RegionPtr CreateBoundingShape (pWin) WindowPtr pWin; { @@ -274,7 +274,7 @@ CreateBoundingShape (pWin) return REGION_CREATE(pWin->drawable.pScreen, &extents, 1); } -static RegionPtr +RegionPtr CreateClipShape (pWin) WindowPtr pWin; { @@ -880,7 +880,7 @@ ProcShapeSelectInput (client) * deliver the event */ -static void +void SendShapeNotify (pWin, which) WindowPtr pWin; int which; -- cgit v1.2.3