[xserver-commit] xserver/miext/damage damage.c,1.1.2.3,1.1.2.4

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/miext/damage
In directory pdx:/tmp/cvs-serv23175/miext/damage

Modified Files:
      Tag: xfixes_2_branch
	damage.c 
Log Message:
	* Xext/shm.c: (miShmPutImage), (fbShmCreatePixmap):
	* hw/xnest/GCOps.c: (xnestSetSpans), (xnestGetSpans),
	(xnestQueryBestSize), (xnestPutImage), (xnestGetImage),
	(xnestBitBlitHelper), (xnestCopyArea), (xnestCopyPlane),
	(xnestPolyPoint), (xnestPolylines), (xnestPolyText16),
	(xnestImageText16), (xnestImageGlyphBlt), (xnestPolyGlyphBlt),
	(xnestPushPixels):
	* hw/xnest/GCOps.h:
	* hw/xnest/Handlers.c: (xnestBlockHandler), (xnestWakeupHandler):
	* hw/xnest/Handlers.h:
	* hw/xnest/Init.c: (InitOutput), (InitInput), (AbortDDX),
	(ddxGiveUp), (OsVendorInit), (OsVendorFatalError):
	* hw/xnest/Keyboard.c: (xnestBell), (xnestChangeKeyboardControl),
	(xnestKeyboardProc):
	* hw/xnest/Keyboard.h:
	* hw/xnest/Pixmap.c: (xnestCreatePixmap), (xnestDestroyPixmap),
	(xnestPixmapToRegion):
	* hw/xnest/Pointer.c: (xnestChangePointerControl),
	(xnestPointerProc):
	* hw/xnest/Pointer.h:
	* hw/xnest/Screen.c: (offset), (xnestSaveScreen),
	(xnestCursorOffScreen), (xnestCrossScreen), (xnestOpenScreen),
	(xnestCloseScreen):
	* hw/xnest/Screen.h:
	* hw/xnest/Visual.c: (xnestDefaultVisualColormap):
	* hw/xnest/Visual.h:
	* hw/xnest/Window.c: (xnestFindWindowMatch), (xnestCreateWindow),
	(xnestDestroyWindow), (xnestPositionWindow),
	(xnestConfigureWindow), (xnestChangeWindowAttributes),
	(xnestRealizeWindow), (xnestUnrealizeWindow),
	(xnestPaintWindowBackground), (xnestPaintWindowBorder),
	(xnestCopyWindow), (xnestClipNotify),
	(xnestWindowExposurePredicate), (xnestWindowExposures),
	(xnestRegionEqual), (xnestShapeWindow):
	* hw/xnest/XNPixmap.h:
	* hw/xnest/XNWindow.h:
	* mi/miscrinit.c:
	* miext/damage/damage.c:
	* miext/shadow/shrotpack.h:
	Prototype fixes (mostly in Xnest).  Seems to build -Werror now.


Index: damage.c
===================================================================
RCS file: /cvs/xserver/xserver/miext/damage/Attic/damage.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- damage.c	24 Oct 2003 06:35:24 -0000	1.1.2.3
+++ damage.c	1 Nov 2003 04:11:16 -0000	1.1.2.4
@@ -245,7 +245,8 @@
     return ret;
 }
 
-void
+#if NOTUSED
+static void
 damageWrapGC (GCPtr pGC)
 {
     damageGCPriv(pGC);
@@ -255,7 +256,7 @@
     pGC->funcs = &damageGCFuncs;
 }
 
-void
+static void
 damageUnwrapGC (GCPtr pGC)
 {
     damageGCPriv(pGC);
@@ -264,6 +265,7 @@
     if (pGCPriv->ops)
 	pGC->ops = pGCPriv->ops;
 }
+#endif
 
 #define DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable) \
     damageGCPriv(pGC);  \