Remove libcwrapper usage from xorg server modules. The libcwrapper is…

… only

    of (marginal) use in the drivers, and that usage remains.

ChangeLog

@@ -1,3 +1,198 @@
+2006-02-10  Eric Anholt  <[email protected]>
+
+	* GL/glx/glxcmds.c:
+	* GL/glx/glximports.c:
+	* GL/glx/glxscreens.c:
+	* GL/glx/glxutil.c:
+	* GL/glx/indirect_util.c:
+	* GL/glx/single2.c:
+	* GL/include/GL/glx_ansic.h:
+	* GL/include/GL/xf86glx.h:
+	* GL/mesa/X/xf86glx_util.c:
+	* XTrap/xtrapddmi.c:
+	* XTrap/xtrapdi.c:
+	* XTrap/xtrapditbl.c:
+	* Xext/cup.c:
+	* Xext/mbuf.c:
+	* Xext/saver.c:
+	* Xext/shape.c:
+	* Xext/shm.c:
+	* Xext/sync.c:
+	* Xext/xtest.c:
+	* Xext/xvdisp.c:
+	* Xext/xvmain.c:
+	* Xext/xvmc.c:
+	* afb/afb.h:
+	* afb/afbbitblt.c:
+	* afb/afbblt.c:
+	* afb/afbclip.c:
+	* afb/afbgc.c:
+	* afb/afbimage.c:
+	* afb/afbpixmap.c:
+	* afb/afbply1rct.c:
+	* afb/afbpushpxl.c:
+	* afb/afbscrinit.c:
+	* afb/afbwindow.c:
+	* cfb/cfb.h:
+	* cfb/cfb8line.c:
+	* cfb/cfbbitblt.c:
+	* cfb/cfbblt.c:
+	* cfb/cfbcppl.c:
+	* cfb/cfbfillarc.c:
+	* cfb/cfbgc.c:
+	* cfb/cfbimage.c:
+	* cfb/cfbline.c:
+	* cfb/cfbmskbits.h:
+	* cfb/cfbpixmap.c:
+	* cfb/cfbply1rct.c:
+	* cfb/cfbwindow.c:
+	* cfb/cfbzerarc.c:
+	* configure.ac:
+	* dbe/dbe.c:
+	* dbe/midbe.c:
+	* fb/fb24_32.c:
+	* fb/fbarc.c: (fbPolyArc):
+	* fb/fbcompose.c:
+	* fb/fbcopy.c:
+	* fb/fbgc.c:
+	* fb/fbimage.c:
+	* fb/fboverlay.c:
+	* fb/fbpict.c:
+	* fb/fbpixmap.c:
+	* fb/fbpseudocolor.c:
+	* fb/fbseg.c:
+	* fb/fbwindow.c:
+	* hw/xfree86/common/compiler.h:
+	* hw/xfree86/common/xf86.h:
+	* hw/xfree86/ddc/ddcProperty.c:
+	* hw/xfree86/ddc/edid.c:
+	* hw/xfree86/ddc/interpret_edid.c:
+	* hw/xfree86/ddc/print_edid.c:
+	* hw/xfree86/ddc/xf86DDC.c:
+	* hw/xfree86/dixmods/extmod/modinit.c:
+	* hw/xfree86/dixmods/extmod/xf86dga2.c:
+	* hw/xfree86/dixmods/extmod/xf86misc.c:
+	* hw/xfree86/dixmods/extmod/xf86vmode.c:
+	* hw/xfree86/dri/dri.c:
+	* hw/xfree86/dri/xf86dri.c:
+	* hw/xfree86/exa/exa_migration.c:
+	* hw/xfree86/exa/exa_offscreen.c: (exaOffscreenAlloc):
+	* hw/xfree86/fbdevhw/fbdevhw.c:
+	* hw/xfree86/i2c/bt829.c:
+	* hw/xfree86/i2c/fi1236.c:
+	* hw/xfree86/i2c/msp3430.c:
+	* hw/xfree86/i2c/xf86i2c.c: (I2CUDelay):
+	* hw/xfree86/int10/generic.c:
+	* hw/xfree86/int10/helper_exec.c: (x_inw), (x_outb):
+	* hw/xfree86/int10/helper_mem.c:
+	* hw/xfree86/int10/pci.c:
+	* hw/xfree86/int10/x86emu.c:
+	* hw/xfree86/int10/xf86int10.c:
+	* hw/xfree86/int10/xf86x86emu.c:
+	* hw/xfree86/os-support/bsd/bsd_jstk.c:
+	* hw/xfree86/os-support/bsd/bsd_kmod.c:
+	* hw/xfree86/os-support/drm/xf86drm.c:
+	* hw/xfree86/os-support/drm/xf86drmHash.c:
+	* hw/xfree86/os-support/drm/xf86drmRandom.c:
+	* hw/xfree86/os-support/drm/xf86drmSL.c:
+	* hw/xfree86/os-support/linux/int10/linux.c:
+	* hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c:
+	* hw/xfree86/os-support/linux/lnx_jstk.c:
+	* hw/xfree86/rac/xf86RAC.c:
+	* hw/xfree86/ramdac/BT.c:
+	* hw/xfree86/ramdac/IBM.c:
+	* hw/xfree86/ramdac/TI.c:
+	* hw/xfree86/ramdac/xf86Cursor.c:
+	* hw/xfree86/ramdac/xf86HWCurs.c:
+	* hw/xfree86/ramdac/xf86RamDac.c:
+	* hw/xfree86/ramdac/xf86RamDacCmap.c:
+	* hw/xfree86/scanpci/xf86ScanPci.c:
+	* hw/xfree86/utils/xorgcfg/loader.h:
+	* hw/xfree86/vbe/vbe.c:
+	* hw/xfree86/vbe/vbeModes.c:
+	* hw/xfree86/vgahw/vgaCmap.c:
+	* hw/xfree86/vgahw/vgaHW.c:
+	* hw/xfree86/x86emu/decode.c:
+	* hw/xfree86/x86emu/prim_ops.c:
+	* hw/xfree86/xaa/xaaBitBlt.c:
+	* hw/xfree86/xaa/xaaBitmap.c:
+	* hw/xfree86/xaa/xaaCpyArea.c:
+	* hw/xfree86/xaa/xaaCpyPlane.c:
+	* hw/xfree86/xaa/xaaCpyWin.c:
+	* hw/xfree86/xaa/xaaDashLine.c:
+	* hw/xfree86/xaa/xaaFallback.c:
+	* hw/xfree86/xaa/xaaFillArc.c:
+	* hw/xfree86/xaa/xaaFillPoly.c:
+	* hw/xfree86/xaa/xaaFillRect.c:
+	* hw/xfree86/xaa/xaaGC.c:
+	* hw/xfree86/xaa/xaaGCmisc.c:
+	* hw/xfree86/xaa/xaaImage.c:
+	* hw/xfree86/xaa/xaaInit.c:
+	* hw/xfree86/xaa/xaaInitAccel.c:
+	* hw/xfree86/xaa/xaaLine.c:
+	* hw/xfree86/xaa/xaaLineMisc.c:
+	* hw/xfree86/xaa/xaaNonTEGlyph.c:
+	* hw/xfree86/xaa/xaaNonTEText.c:
+	* hw/xfree86/xaa/xaaOffscreen.c:
+	* hw/xfree86/xaa/xaaOverlay.c:
+	* hw/xfree86/xaa/xaaOverlayDF.c:
+	* hw/xfree86/xaa/xaaPCache.c:
+	* hw/xfree86/xaa/xaaPaintWin.c:
+	* hw/xfree86/xaa/xaaPict.c:
+	* hw/xfree86/xaa/xaaROP.c:
+	* hw/xfree86/xaa/xaaRect.c:
+	* hw/xfree86/xaa/xaaSpans.c:
+	* hw/xfree86/xaa/xaaStateChange.c:
+	* hw/xfree86/xaa/xaaStipple.c:
+	* hw/xfree86/xaa/xaaTEGlyph.c:
+	* hw/xfree86/xaa/xaaTEText.c:
+	* hw/xfree86/xaa/xaaWideLine.c:
+	* hw/xfree86/xf4bpp/OScompiler.h:
+	* hw/xfree86/xf4bpp/mfbline.c:
+	* hw/xfree86/xf4bpp/ppcClip.c:
+	* hw/xfree86/xf4bpp/ppcCpArea.c:
+	* hw/xfree86/xf4bpp/ppcGC.c:
+	* hw/xfree86/xf4bpp/ppcIO.c:
+	* hw/xfree86/xf4bpp/ppcImg.c:
+	* hw/xfree86/xf4bpp/ppcPixmap.c:
+	* hw/xfree86/xf4bpp/ppcSetSp.c:
+	* hw/xfree86/xf4bpp/ppcWindow.c:
+	* hw/xfree86/xf8_32bpp/cfbcpyarea.c:
+	* hw/xfree86/xf8_32bpp/cfbgcmisc.c:
+	* hw/xfree86/xf8_32bpp/cfbimage.c:
+	* hw/xfree86/xf8_32bpp/cfbwindow.c:
+	* hw/xfree86/xf8_32bpp/xf86overlay.c:
+	* include/os.h:
+	* mfb/mfb.h:
+	* mfb/mfbbitblt.c:
+	* mfb/mfbblt.c:
+	* mfb/mfbclip.c:
+	* mfb/mfbfillarc.c:
+	* mfb/mfbgc.c:
+	* mfb/mfbimage.c:
+	* mfb/mfbline.c:
+	* mfb/mfbpixmap.c:
+	* mfb/mfbply1rct.c:
+	* mfb/mfbpushpxl.c:
+	* mfb/mfbscrinit.c:
+	* mfb/mfbwindow.c:
+	* mfb/mfbzerarc.c:
+	* miext/cw/cw.c:
+	* miext/cw/cw_ops.c:
+	* miext/cw/cw_render.c:
+	* miext/damage/damage.c:
+	* miext/shadow/shadow.c:
+	* miext/shadow/shpacked.c:
+	* miext/shadow/shplanar.c:
+	* miext/shadow/shplanar8.c:
+	* miext/shadow/shrotpack.h:
+	* randr/randr.c:
+	* record/record.c:
+	* record/set.c:
+	* render/render.c:
+	Remove libcwrapper usage from xorg server modules.  The libcwrapper is
+	only of (marginal) use in the drivers, and that usage remains.
+
 2006-02-09  Eric Anholt  <[email protected]>
 
 	* configure.ac:

GL/glx/glxcmds.c

@@ -40,6 +40,8 @@
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include "glxserver.h"
 #include <GL/glxtokens.h>
 #include <unpack.h>

GL/glx/glximports.c

@@ -38,6 +38,10 @@
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "glxserver.h"
 #include "glxcontext.h"
 #include "glximports.h"

GL/glx/glxscreens.c

@@ -38,9 +38,7 @@
 #include <dix-config.h>
 #endif
 
-#ifdef IN_MODULE
-#include <xf86_ansic.h>
-#else
+#ifndef IN_MODULE
 #include <string.h>
 #include <signal.h>
 #endif

GL/glx/glxutil.c

@@ -40,6 +40,8 @@
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+
 #include "glxserver.h"
 #include <GL/glxtokens.h>
 #include <unpack.h>

GL/glx/indirect_util.c

@@ -23,6 +23,8 @@
  * SOFTWARE.
  */
 
+#include <string.h>
+
 #include <X11/Xmd.h>
 #include <GL/gl.h>
 #include <GL/glxproto.h>

GL/glx/single2.c

@@ -39,6 +39,10 @@
 #include <dix-config.h>
 #endif
 
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "glxserver.h"
 #include "glxutil.h"
 #include "glxext.h"

GL/include/GL/glx_ansic.h

@@ -56,9 +56,6 @@
 
 #ifdef XFree86Server
 
-#ifdef XFree86LOADER
-#include "xf86_ansic.h"
-#endif
 #ifndef assert
 #define assert(a)
 #endif

GL/include/GL/xf86glx.h

@@ -37,7 +37,3 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #endif
 
 #include "miscstruct.h"
-
-#ifdef XFree86LOADER
-#include "xf86_ansic.h"
-#endif

GL/mesa/X/xf86glx_util.c

@@ -36,6 +36,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include <gcstruct.h>
 #include "pixmapstr.h"
 #include "xf86glx_util.h"

XTrap/xtrapddmi.c

@@ -50,8 +50,6 @@ SOFTWARE.
 # include "io.h"
 # define O_NDELAY 0L
 #endif
-#else
-#include "xf86_ansic.h"
 #endif
 
 #define NEED_REPLIES

XTrap/xtrapdi.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.2 2004/04/23 18:44:40 eich Exp $ */
+/* $XdotOrg: xserver/xorg/XTrap/xtrapdi.c,v 1.5 2005/07/03 08:53:36 daniels Exp $ */
 /* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.6tsi Exp $ */
 /*****************************************************************************
 Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
@@ -59,8 +59,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <stdio.h>
 #include <errno.h>
 #include <X11/Xos.h>
-#else
-#include "xf86_ansic.h"
 #endif
 #include <X11/X.h>
 #include <X11/Xproto.h>

XTrap/xtrapditbl.c

@@ -39,6 +39,8 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include <X11/X.h>
 #define NEED_REPLIES
 #define NEED_EVENTS

Xext/cup.c

@@ -45,11 +45,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/extensions/Xcupstr.h>
 #include <X11/Xfuncproto.h>
 
-#ifndef EXTMODULE
 #include "../os/osdep.h"
-#else
-#include "xf86_ansic.h"
-#endif
 
 #include "modinit.h"
 

Xext/mbuf.c

@@ -48,14 +48,10 @@ in this Software without prior written authorization from The Open Group.
 #define _MULTIBUF_SERVER_	/* don't want Xlib structures */
 #include <X11/extensions/multibufst.h>
 
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#else
 #include <stdio.h>
 #if !defined(WIN32) && !defined(Lynx)
 #include <sys/time.h>
 #endif
-#endif
 
 /* given an OtherClientPtr obj, get the ClientPtr */
 #define rClient(obj) (clients[CLIENT_ID((obj)->resource)])

Xext/saver.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/saver.c,v 1.7 2005/04/20 12:25:12 daniels Exp $ */
+/* $XdotOrg: xserver/xorg/Xext/saver.c,v 1.10 2005/07/03 08:53:36 daniels Exp $ */
 /*
  * $XConsortium: saver.c,v 1.12 94/04/17 20:59:36 dpw Exp $
  *
@@ -57,11 +57,7 @@ in this Software without prior written authorization from the X Consortium.
 #endif
 
 
-#ifdef IN_MODULE
-#include <xf86_ansic.h>
-#else
 #include <stdio.h>
-#endif
 
 #include "modinit.h"
 

Xext/shape.c

@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.6 2005/06/10 04:01:14 ajax Exp $ */
+/* $XdotOrg: xserver/xorg/Xext/shape.c,v 1.9 2005/07/03 08:53:36 daniels Exp $ */
 /* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.18 2003/10/28 23:08:43 tsi Exp $ */
 /************************************************************
 
@@ -33,6 +33,8 @@ in this Software without prior written authorization from The Open Group.
 #include <dix-config.h>
 #endif
 
+#include <stdlib.h>
+
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include "misc.h"
@@ -48,9 +50,6 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/extensions/shapestr.h>
 #include "regionstr.h"
 #include "gcstruct.h"
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#endif
 #include "modinit.h"
 
 typedef	RegionPtr (*CreateDftPtr)(

Xext/shm.c

@@ -62,9 +62,6 @@ in this Software without prior written authorization from The Open Group.
 #define _XSHM_SERVER_
 #include <X11/extensions/shmstr.h>
 #include <X11/Xfuncproto.h>
-#ifdef EXTMODULE
-#include "xf86_ansic.h"
-#endif
 
 #ifdef PANORAMIX
 #include "panoramiX.h"