[xserver-commit] xserver/mi miscrinit.c,3.19,3.19.2.1

[Keith Packard]

Committed by: keithp

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

Modified Files:
      Tag: xfixes_2_branch
	miscrinit.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: miscrinit.c
===================================================================
RCS file: /cvs/xserver/xserver/mi/miscrinit.c,v
retrieving revision 3.19
retrieving revision 3.19.2.1
diff -u -d -r3.19 -r3.19.2.1
--- miscrinit.c	12 Sep 2003 01:49:46 -0000	3.19
+++ miscrinit.c	1 Nov 2003 04:11:16 -0000	3.19.2.1
@@ -40,8 +40,7 @@
 #include "dix.h"
 #include "miline.h"
 #ifdef MITSHM
-#define _XSHM_SERVER_
-#include <X11/extensions/XShm.h>
+#include "shmint.h"
 #endif
 
 /* We use this structure to propogate some information from miScreenInit to