[xserver-commit] xserver/Xext shm.c,3.40.2.2,3.40.2.3

[Keith Packard]

Committed by: keithp

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

Modified Files:
      Tag: xfixes_2_branch
	shm.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: shm.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/shm.c,v
retrieving revision 3.40.2.2
retrieving revision 3.40.2.3
diff -u -d -r3.40.2.2 -r3.40.2.3
--- shm.c	31 Oct 2003 21:48:09 -0000	3.40.2.2
+++ shm.c	1 Nov 2003 04:11:15 -0000	3.40.2.3
@@ -79,26 +79,50 @@
     unsigned long size;
 } ShmDescRec, *ShmDescPtr;
 
-static void miShmPutImage(XSHM_PUT_IMAGE_ARGS);
-static void fbShmPutImage(XSHM_PUT_IMAGE_ARGS);
-static PixmapPtr fbShmCreatePixmap(XSHM_CREATE_PIXMAP_ARGS);
-static int ShmDetachSegment(
-#if NeedFunctionPrototypes
-    pointer		/* value */,
-    XID			/* shmseg */
-#endif
-    );
-static void ShmResetProc(
-#if NeedFunctionPrototypes
-    ExtensionEntry *	/* extEntry */
-#endif
-    );
-static void SShmCompletionEvent(
-#if NeedFunctionPrototypes
-    xShmCompletionEvent * /* from */,
-    xShmCompletionEvent * /* to */
-#endif
-    );
+static void
+miShmPutImage(DrawablePtr   dst,
+	      GCPtr	    pGC,
+	      int	    depth,
+	      unsigned int  format,
+	      int	    w,
+	      int	    h,
+	      int	    sx,
+	      int	    sy,
+	      int	    sw,
+	      int	    sh,
+	      int	    dx,
+	      int	    dy,
+	      char	    *data);
+    
+static void
+fbShmPutImage(DrawablePtr   dst,
+	      GCPtr	    pGC,
+	      int	    depth,
+	      unsigned int  format,
+	      int	    w,
+	      int	    h,
+	      int	    sx,
+	      int	    sy,
+	      int	    sw,
+	      int	    sh,
+	      int	    dx,
+	      int	    dy,
+	      char	    *data);
+    
+static PixmapPtr
+fbShmCreatePixmap (ScreenPtr	pScreen,
+		   int		width,
+		   int		height,
+		   int		depth,
+		   char		*addr);
+
+static int ShmDetachSegment(pointer	value,
+			    XID		shmseg);
+
+static void ShmResetProc(ExtensionEntry	*extEntry);
+
+static void SShmCompletionEvent(xShmCompletionEvent *from,
+				xShmCompletionEvent *to);
 
 static Bool ShmDestroyPixmap (PixmapPtr pPixmap);
 
@@ -491,12 +515,19 @@
 }
 
 static void
-miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data)
-    DrawablePtr dst;
-    GCPtr	pGC;
-    int		depth, w, h, sx, sy, sw, sh, dx, dy;
-    unsigned int format;
-    char 	*data;
+miShmPutImage(DrawablePtr   dst,
+	      GCPtr	    pGC,
+	      int	    depth,
+	      unsigned int  format,
+	      int	    w,
+	      int	    h,
+	      int	    sx,
+	      int	    sy,
+	      int	    sw,
+	      int	    sh,
+	      int	    dx,
+	      int	    dy,
+	      char	    *data)
 {
     PixmapPtr pmap;
     GCPtr putGC;
@@ -1010,12 +1041,11 @@
 }
 
 static PixmapPtr
-fbShmCreatePixmap (pScreen, width, height, depth, addr)
-    ScreenPtr	pScreen;
-    int		width;
-    int		height;
-    int		depth;
-    char	*addr;
+fbShmCreatePixmap (ScreenPtr	pScreen,
+		   int		width,
+		   int		height,
+		   int		depth,
+		   char		*addr)
 {
     register PixmapPtr pPixmap;