diff options
| author | Eric Anholt <anholt@freebsd.org> | 2006-02-10 22:00:30 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2006-02-10 22:00:30 +0000 |
| commit | c3d14036729fd186d4ec7ca1de603e1f2d174e2f (patch) | |
| tree | 6fc1290e4da4a16eea3c10c250d302df6b9e98c2 | |
| parent | a8cec1b656f57746758613213de1d6e5acb79451 (diff) | |
Remove libcwrapper usage from xorg server modules. The libcwrapper is only
of (marginal) use in the drivers, and that usage remains.
193 files changed, 508 insertions, 321 deletions
@@ -1,3 +1,198 @@ +2006-02-10 Eric Anholt <anholt@FreeBSD.org> + + * 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 <anholt@FreeBSD.org> * configure.ac: diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c index f889d4286..c63b17008 100644 --- a/GL/glx/glxcmds.c +++ b/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> diff --git a/GL/glx/glximports.c b/GL/glx/glximports.c index fae2346b9..a443495c4 100644 --- a/GL/glx/glximports.c +++ b/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" diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c index 58b38b1a2..ffe1935e3 100644 --- a/GL/glx/glxscreens.c +++ b/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 diff --git a/GL/glx/glxutil.c b/GL/glx/glxutil.c index 03bc19f63..25586433f 100644 --- a/GL/glx/glxutil.c +++ b/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> diff --git a/GL/glx/indirect_util.c b/GL/glx/indirect_util.c index bf0ba66f2..706d43864 100644 --- a/GL/glx/indirect_util.c +++ b/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> diff --git a/GL/glx/single2.c b/GL/glx/single2.c index fc6cdf160..c44336af4 100644 --- a/GL/glx/single2.c +++ b/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" diff --git a/GL/include/GL/glx_ansic.h b/GL/include/GL/glx_ansic.h index c94393fd1..9085a08fe 100644 --- a/GL/include/GL/glx_ansic.h +++ b/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 diff --git a/GL/include/GL/xf86glx.h b/GL/include/GL/xf86glx.h index 66f096a98..5d018d72b 100644 --- a/GL/include/GL/xf86glx.h +++ b/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 diff --git a/GL/mesa/X/xf86glx_util.c b/GL/mesa/X/xf86glx_util.c index 6441a4b4f..d8afcbcb5 100644 --- a/GL/mesa/X/xf86glx_util.c +++ b/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" diff --git a/XTrap/xtrapddmi.c b/XTrap/xtrapddmi.c index 2dba356b7..afaf105f2 100644 --- a/XTrap/xtrapddmi.c +++ b/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 diff --git a/XTrap/xtrapdi.c b/XTrap/xtrapdi.c index f08c6155a..8b045cd19 100644 --- a/XTrap/xtrapdi.c +++ b/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> diff --git a/XTrap/xtrapditbl.c b/XTrap/xtrapditbl.c index a9ceddb3d..27cfc362b 100644 --- a/XTrap/xtrapditbl.c +++ b/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 diff --git a/Xext/cup.c b/Xext/cup.c index 4db62cf15..879130ece 100644 --- a/Xext/cup.c +++ b/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" diff --git a/Xext/mbuf.c b/Xext/mbuf.c index 3129edd87..9933fe0fd 100644 --- a/Xext/mbuf.c +++ b/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)]) diff --git a/Xext/saver.c b/Xext/saver.c index 7f9a84faa..dff1f14fe 100644 --- a/Xext/saver.c +++ b/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" diff --git a/Xext/shape.c b/Xext/shape.c index e797878ab..c5bb4e38c 100644 --- a/Xext/shape.c +++ b/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)( diff --git a/Xext/shm.c b/Xext/shm.c index 806008c60..3a8f067fc 100644 --- a/Xext/shm.c +++ b/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" diff --git a/Xext/sync.c b/Xext/sync.c index 0e0df8305..c43c4af58 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -58,6 +58,8 @@ PERFORMANCE OF THIS SOFTWARE. #include <dix-config.h> #endif +#include <string.h> + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/Xmd.h> @@ -71,14 +73,10 @@ PERFORMANCE OF THIS SOFTWARE. #include <X11/extensions/sync.h> #include <X11/extensions/syncstr.h> -#ifdef EXTMODULE -#include "xf86_ansic.h" -#else #include <stdio.h> #if !defined(WIN32) && !defined(Lynx) #include <sys/time.h> #endif -#endif #include "modinit.h" diff --git a/Xext/xtest.c b/Xext/xtest.c index 413437192..6737185aa 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/xtest.c,v 1.3 2005/04/20 12:25:12 daniels Exp $ */ +/* $XdotOrg: xserver/xorg/Xext/xtest.c,v 1.6 2005/07/03 08:53:36 daniels Exp $ */ /* $Xorg: xtest.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /* @@ -54,9 +54,6 @@ from The Open Group. #define EXTENSION_EVENT_BASE 64 #include "extinit.h" /* LookupDeviceIntRec */ #endif /* XINPUT */ -#ifdef EXTMODULE -#include "xf86_ansic.h" -#endif #include "modinit.h" diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c index 98e854fed..7c490abca 100644 --- a/Xext/xvdisp.c +++ b/Xext/xvdisp.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/xvdisp.c,v 1.3 2005/04/20 12:25:12 daniels Exp $ */ +/* $XdotOrg: xserver/xorg/Xext/xvdisp.c,v 1.6 2005/07/03 08:53:36 daniels Exp $ */ /*********************************************************** Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute of Technology, Cambridge, Massachusetts. @@ -52,6 +52,8 @@ SOFTWARE. #include <dix-config.h> #endif +#include <string.h> + #include <X11/X.h> #include <X11/Xproto.h> #include "misc.h" @@ -71,10 +73,6 @@ SOFTWARE. #include <X11/extensions/shmstr.h> #endif -#ifdef EXTMODULE -#include "xf86_ansic.h" -#endif - #include "xvdisp.h" #ifdef PANORAMIX diff --git a/Xext/xvmain.c b/Xext/xvmain.c index 3a4e82179..0339c8417 100644 --- a/Xext/xvmain.c +++ b/Xext/xvmain.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/xvmain.c,v 1.3 2005/04/20 12:25:12 daniels Exp $ */ +/* $XdotOrg: xserver/xorg/Xext/xvmain.c,v 1.6 2005/07/03 08:53:36 daniels Exp $ */ /*********************************************************** Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute of Technology, Cambridge, Massachusetts. @@ -79,6 +79,8 @@ SOFTWARE. #include <dix-config.h> #endif +#include <string.h> + #include <X11/X.h> #include <X11/Xproto.h> #include "misc.h" @@ -99,10 +101,6 @@ SOFTWARE. #include <X11/extensions/Xvproto.h> #include "xvdix.h" -#ifdef EXTMODULE -#include "xf86_ansic.h" -#endif - #ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" diff --git a/Xext/xvmc.c b/Xext/xvmc.c index 37fb153ab..a814f003e 100644 --- a/Xext/xvmc.c +++ b/Xext/xvmc.c @@ -6,6 +6,8 @@ #include <dix-config.h> #endif +#include <string.h> + #include <X11/X.h> #include <X11/Xproto.h> #include "misc.h" @@ -1125,8 +1125,3 @@ typedef struct _afbpos{ #define MFB_EQWHOLEWORD_INVERT ^=~0 #define MFB_OP_WHITE /* nothing */ #define MFB_OP_BLACK ~ - -#ifdef XFree86LOADER -#include "xf86_ansic.h" -#endif - diff --git a/afb/afbbitblt.c b/afb/afbbitblt.c index 0c1c6bb9f..93d4a2bf0 100644 --- a/afb/afbbitblt.c +++ b/afb/afbbitblt.c @@ -53,6 +53,8 @@ SOFTWARE. #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include <X11/Xprotostr.h> diff --git a/afb/afbblt.c b/afb/afbblt.c index 6cbb0a878..9eb0227f2 100644 --- a/afb/afbblt.c +++ b/afb/afbblt.c @@ -37,6 +37,8 @@ Author: Keith Packard #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/afb/afbclip.c b/afb/afbclip.c index ea7413233..89314f134 100644 --- a/afb/afbclip.c +++ b/afb/afbclip.c @@ -52,6 +52,8 @@ SOFTWARE. #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include "regionstr.h" #include "pixmapstr.h" diff --git a/afb/afbgc.c b/afb/afbgc.c index e9f4c52b7..14c95c754 100644 --- a/afb/afbgc.c +++ b/afb/afbgc.c @@ -52,6 +52,8 @@ SOFTWARE. #include <dix-config.h> #endif +#include <string.h> + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/afb/afbimage.c b/afb/afbimage.c index 353fd6f89..a0b4270e8 100644 --- a/afb/afbimage.c +++ b/afb/afbimage.c @@ -4,6 +4,8 @@ #include <dix-config.h> #endif +#include <string.h> + #include <X11/X.h> #include "windowstr.h" #include "pixmapstr.h" diff --git a/afb/afbpixmap.c b/afb/afbpixmap.c index c6ae8481c..72482ff7f 100644 --- a/afb/afbpixmap.c +++ b/afb/afbpixmap.c @@ -58,6 +58,8 @@ SOFTWARE. #include <dix-config.h> #endif +#include <string.h> + #include <X11/Xmd.h> #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/afb/afbply1rct.c b/afb/afbply1rct.c index 90e55cf8e..b7a16e086 100644 --- a/afb/afbply1rct.c +++ b/afb/afbply1rct.c @@ -32,6 +32,8 @@ in this Software without prior written authorization from the X Consortium. #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include "gcstruct.h" diff --git a/afb/afbpushpxl.c b/afb/afbpushpxl.c index e62181188..0e428568b 100644 --- a/afb/afbpushpxl.c +++ b/afb/afbpushpxl.c @@ -52,6 +52,8 @@ SOFTWARE. #include <dix-config.h> #endif +#include <string.h> + #include <X11/X.h> #include "gcstruct.h" #include "scrnintstr.h" diff --git a/afb/afbscrinit.c b/afb/afbscrinit.c index 2e10ad885..7b4c70311 100644 --- a/afb/afbscrinit.c +++ b/afb/afbscrinit.c @@ -52,6 +52,8 @@ SOFTWARE. #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include <X11/Xproto.h> /* for xColorItem */ #include <X11/Xmd.h> diff --git a/afb/afbwindow.c b/afb/afbwindow.c index 443dd5aed..90a4f7dfe 100644 --- a/afb/afbwindow.c +++ b/afb/afbwindow.c @@ -53,6 +53,8 @@ SOFTWARE. #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" @@ -1316,12 +1316,6 @@ extern int cfbScreenPrivateIndex; #include "micoord.h" -/* - * if CFB is built as a module, it shouldn't call libc functions. - */ -#ifdef XFree86LOADER -#include "xf86_ansic.h" -#endif #endif /* !CFB_PROTOTYPES_ONLY */ #endif diff --git a/cfb/cfb8line.c b/cfb/cfb8line.c index 0f27f1d47..9740c2139 100644 --- a/cfb/cfb8line.c +++ b/cfb/cfb8line.c @@ -33,6 +33,7 @@ in this Software without prior written authorization from The Open Group. #include <dix-config.h> #endif +#include <stdlib.h> #include <X11/X.h> #include "gcstruct.h" diff --git a/cfb/cfbbitblt.c b/cfb/cfbbitblt.c index a9dd438fe..2e621337a 100644 --- a/cfb/cfbbitblt.c +++ b/cfb/cfbbitblt.c @@ -37,6 +37,8 @@ Author: Keith Packard #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/cfb/cfbblt.c b/cfb/cfbblt.c index 7a0b192cc..db32c87e5 100644 --- a/cfb/cfbblt.c +++ b/cfb/cfbblt.c @@ -38,6 +38,8 @@ Author: Keith Packard #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/cfb/cfbcppl.c b/cfb/cfbcppl.c index 037a516f2..f58682056 100644 --- a/cfb/cfbcppl.c +++ b/cfb/cfbcppl.c @@ -31,6 +31,7 @@ in this Software without prior written authorization from The Open Group. #include <dix-config.h> #endif +#include <string.h> #include <X11/X.h> #include <X11/Xmd.h> #include "gcstruct.h" diff --git a/cfb/cfbfillarc.c b/cfb/cfbfillarc.c index 6fb6bb728..797e9ea78 100644 --- a/cfb/cfbfillarc.c +++ b/cfb/cfbfillarc.c @@ -31,6 +31,8 @@ in this Software without prior written authorization from The Open Group. #include <dix-config.h> #endif +#include <sys/limits.h> + #include <X11/X.h> #include <X11/Xprotostr.h> #include "regionstr.h" @@ -358,7 +360,7 @@ RROP_NAME(cfbPolyFillArcSolid) (pDraw, pGC, narcs, parcs) box.x2 = x2; y2 = box.y1 + (int)arc->height + 1; box.y2 = y2; - if ( (x2 <= MAXSHORT) && (y2 <= MAXSHORT) && + if ( (x2 <= SHRT_MAX) && (y2 <= SHRT_MAX) && (RECT_IN_REGION(pDraw->pScreen, cclip, &box) == rgnIN) ) { if ((arc->angle2 >= FULLCIRCLE) || diff --git a/cfb/cfbgc.c b/cfb/cfbgc.c index 9cf53d35b..248b2042a 100644 --- a/cfb/cfbgc.c +++ b/cfb/cfbgc.c @@ -52,6 +52,8 @@ SOFTWARE. #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/cfb/cfbimage.c b/cfb/cfbimage.c index ce3909e63..f8c298922 100644 --- a/cfb/cfbimage.c +++ b/cfb/cfbimage.c @@ -51,6 +51,8 @@ SOFTWARE. #include <dix-config.h> #endif +#include <string.h> + #include <X11/X.h> #include "windowstr.h" #include "pixmapstr.h" diff --git a/cfb/cfbline.c b/cfb/cfbline.c index 392fe483e..c70c48a51 100644 --- a/cfb/cfbline.c +++ b/cfb/cfbline.c @@ -50,6 +50,7 @@ SOFTWARE. #include <dix-config.h> #endif +#include <stdlib.h> #include <X11/X.h> #include "gcstruct.h" diff --git a/cfb/cfbmskbits.h b/cfb/cfbmskbits.h index a803cac72..f9ce33a61 100644 --- a/cfb/cfbmskbits.h +++ b/cfb/cfbmskbits.h @@ -36,7 +36,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "servermd.h" #if defined(XFREE86) || ( defined(__OpenBSD__) && defined(__alpha__) ) \ || (defined(__bsdi__)) -#include "xf86_ansic.h" #include "compiler.h" #endif diff --git a/cfb/cfbpixmap.c b/cfb/cfbpixmap.c index 704ab4eda..e73cf5735 100644 --- a/cfb/cfbpixmap.c +++ b/cfb/cfbpixmap.c @@ -52,6 +52,8 @@ SOFTWARE. on a monchrome device, a pixmap is a bitmap. */ +#include <string.h> + #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif diff --git a/cfb/cfbply1rct.c b/cfb/cfbply1rct.c index 99a2379c9..b431f33e1 100644 --- a/cfb/cfbply1rct.c +++ b/cfb/cfbply1rct.c @@ -31,6 +31,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 "gcstruct.h" diff --git a/cfb/cfbwindow.c b/cfb/cfbwindow.c index 7160f5436..ebc1c4593 100644 --- a/cfb/cfbwindow.c +++ b/cfb/cfbwindow.c @@ -51,6 +51,8 @@ SOFTWARE. #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" diff --git a/cfb/cfbzerarc.c b/cfb/cfbzerarc.c index a9e0b2f9d..0d88bfd5a 100644 --- a/cfb/cfbzerarc.c +++ b/cfb/cfbzerarc.c @@ -37,6 +37,8 @@ in this Software without prior written authorization from The Open Group. #include <dix-config.h> #endif +#include <sys/limits.h> + #include <X11/X.h> #include <X11/Xprotostr.h> #include "regionstr.h" @@ -308,7 +310,7 @@ RROP_NAME (cfbZeroPolyArcSS8) (pDraw, pGC, narcs, parcs) box.x2 = x2; y2 = box.y1 + (int)arc->height + 1; box.y2 = y2; - if ( (x2 <= MAXSHORT) && (y2 <= MAXSHORT) && + if ( (x2 <= SHRT_MAX) && (y2 <= SHRT_MAX) && (RECT_IN_REGION(pDraw->pScreen, cclip, &box) == rgnIN) ) RROP_NAME (cfbZeroArcSS8) (pDraw, pGC, arc); else diff --git a/configure.ac b/configure.ac index 81038a583..c24deb3d7 100644 --- a/configure.ac +++ b/configure.ac @@ -833,7 +833,7 @@ if test "x$DMX" = xyes; then modules not found.]) fi DMX_INCLUDES="$XEXT_INC $RENDER_INC $XTRAP_INC $RECORD_INC" - XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_DAMAGE_LIB $LBX_LIB $MIEXT_SHADOW_LIB $CWRAP_LIB $OS_LIB" + XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_DAMAGE_LIB $LBX_LIB $MIEXT_SHADOW_LIB $OS_LIB $CWRAP_LIB" AC_SUBST([XDMX_LIBS]) dnl USB sources in DMX require <linux/input.h> @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/dbe/dbe.c,v 1.3 2005/04/20 12:25:19 daniels Exp $ */ +/* $XdotOrg: xserver/xorg/dbe/dbe.c,v 1.5 2005/07/03 07:01:17 daniels Exp $ */ /* $Xorg: dbe.c,v 1.3 2000/08/17 19:48:16 cpqbld Exp $ */ /****************************************************************************** * @@ -41,6 +41,8 @@ #include <dix-config.h> #endif +#include <string.h> + #include <X11/X.h> #include <X11/Xproto.h> #include "scrnintstr.h" @@ -51,10 +53,6 @@ #include "dbestruct.h" #include "midbe.h" -#ifdef XFree86LOADER -#include "xf86_ansic.h" -#endif - /* GLOBALS */ /* Per-screen initialization functions [init'ed by DbeRegisterFunction()] */ diff --git a/dbe/midbe.c b/dbe/midbe.c index 235693bb2..ef5140963 100644 --- a/dbe/midbe.c +++ b/dbe/midbe.c @@ -58,11 +58,7 @@ #include "gcstruct.h" #include "inputstr.h" -#ifndef IN_MODULE #include <stdio.h> -#else -#include "xf86_ansic.h" -#endif /* DEFINES */ diff --git a/exa/exa_migration.c b/exa/exa_migration.c index 2acda24da..270ad7541 100644 --- a/exa/exa_migration.c +++ b/exa/exa_migration.c @@ -25,6 +25,9 @@ #ifdef HAVE_CONFIG_H #include <xorg-config.h> #endif + +#include <string.h> + #include "exa_priv.h" #include <X11/fonts/fontstruct.h> #include "dixfontstr.h" diff --git a/exa/exa_offscreen.c b/exa/exa_offscreen.c index b0b19f501..c3a2af642 100644 --- a/exa/exa_offscreen.c +++ b/exa/exa_offscreen.c @@ -22,6 +22,10 @@ #include "exa_priv.h" +#include <sys/limits.h> +#include <assert.h> +#include <stdlib.h> + #if DEBUG_OFFSCREEN #define DBG_OFFSCREEN(a) ErrorF a #else @@ -120,7 +124,7 @@ exaOffscreenAlloc (ScreenPtr pScreen, int size, int align, /* prev points at the first object to boot */ best = NULL; - best_score = MAXINT; + best_score = INT_MAX; for (begin = pExaScr->info->card.offScreenAreas; begin != NULL; begin = begin->next) { diff --git a/fb/fb24_32.c b/fb/fb24_32.c index 214e2e6dd..d18ef70ce 100644 --- a/fb/fb24_32.c +++ b/fb/fb24_32.c @@ -27,9 +27,9 @@ #include <dix-config.h> #endif +#include <string.h> #ifdef XFree86LOADER #include "xf86.h" -#include "xf86_ansic.h" #endif #include "fb.h" diff --git a/fb/fbarc.c b/fb/fbarc.c index 315aa181c..98cf8796c 100644 --- a/fb/fbarc.c +++ b/fb/fbarc.c @@ -29,9 +29,7 @@ #include "fb.h" #include "mizerarc.h" -#ifdef IN_MODULE -#include "xf86_ansic.h" -#endif +#include <limits.h> typedef void (*FbArc) (FbBits *dst, FbStride dstStride, @@ -100,7 +98,7 @@ fbPolyArc (DrawablePtr pDrawable, box.x2 = x2; y2 = box.y1 + (int)parcs->height + 1; box.y2 = y2; - if ( (x2 <= MAXSHORT) && (y2 <= MAXSHORT) && + if ( (x2 <= SHRT_MAX) && (y2 <= SHRT_MAX) && (RECT_IN_REGION(pDrawable->pScreen, cclip, &box) == rgnIN) ) (*arc) (dst, dstStride, dstBpp, parcs, pDrawable->x + dstXoff, pDrawable->y + dstYoff, diff --git a/fb/fbcompose.c b/fb/fbcompose.c index 9c2ec4887..f8e0139f0 100644 --- a/fb/fbcompose.c +++ b/fb/fbcompose.c @@ -1,5 +1,5 @@ /* - * $XdotOrg: xc/programs/Xserver/fb/fbcompose.c,v 1.23 2005/10/03 11:43:55 anholt Exp $ + * $XdotOrg: xserver/xorg/fb/fbcompose.c,v 1.26 2005/12/09 18:35:20 ajax Exp $ * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.17tsi Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. @@ -33,10 +33,14 @@ #ifdef RENDER +#include <stdlib.h> +#include <string.h> +#include <math.h> +#include <assert.h> + #include "picturestr.h" #include "mipict.h" #include "fbpict.h" -#include <math.h> #define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b)) diff --git a/fb/fbcopy.c b/fb/fbcopy.c index 1e7b93435..73224da8f 100644 --- a/fb/fbcopy.c +++ b/fb/fbcopy.c @@ -27,10 +27,9 @@ #include <dix-config.h> #endif +#include <stdlib.h> + #include "fb.h" -#ifdef IN_MODULE -#include "xf86_ansic.h" -#endif #include "fbmmx.h" void @@ -21,17 +21,16 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XdotOrg: xserver/xorg/fb/fbgc.c,v 1.5 2005/07/03 07:01:23 daniels Exp $ */ +/* $XdotOrg: xserver/xorg/fb/fbgc.c,v 1.6 2006/01/18 06:49:17 airlied Exp $ */ /* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.14 2003/12/18 15:22:32 alanh Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif +#include <stdlib.h> + #include "fb.h" -#ifdef IN_MODULE -#include "xf86_ansic.h" -#endif const GCFuncs fbGCFuncs = { fbValidateGC, diff --git a/fb/fbimage.c b/fb/fbimage.c index 96bd8cf95..174c78bd0 100644 --- a/fb/fbimage.c +++ b/fb/fbimage.c @@ -27,12 +27,9 @@ #include <dix-config.h> #endif -#include "fb.h" -#ifdef XFree86LOADER -#include "xf86.h" -#include "xf86_ansic.h" -#endif +#include <string.h> +#include "fb.h" void fbPutImage (DrawablePtr pDrawable, diff --git a/fb/fboverlay.c b/fb/fboverlay.c index e777d8e06..e9fb9b24f 100644 --- a/fb/fboverlay.c +++ b/fb/fboverlay.c @@ -23,14 +23,17 @@ * Author: Keith Packard, SuSE, Inc. */ -/* $XdotOrg: xc/programs/Xserver/fb/fboverlay.c,v 1.5 2004/12/04 00:42:50 kuhn Exp $ */ +/* $XdotOrg: xserver/xorg/fb/fboverlay.c,v 1.7 2005/07/03 07:01:23 daniels Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif +#include <stdlib.h> + #include "fb.h" #include "fboverlay.h" +#include "shmint.h" int fbOverlayGeneration; int fbOverlayScreenPrivateIndex = -1; diff --git a/fb/fbpict.c b/fb/fbpict.c index 5ab3756b9..591ddffe3 100644 --- a/fb/fbpict.c +++ b/fb/fbpict.c @@ -27,6 +27,8 @@ #include <dix-config.h> #endif +#include <string.h> + #include "fb.h" #ifdef RENDER diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c index decc07ba6..1e12d8818 100644 --- a/fb/fbpixmap.c +++ b/fb/fbpixmap.c @@ -27,10 +27,9 @@ #include <dix-config.h> #endif +#include <stdlib.h> + #include "fb.h" -#ifdef IN_MODULE -#include "xf86_ansic.h" -#endif PixmapPtr fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp) diff --git a/fb/fbpseudocolor.c b/fb/fbpseudocolor.c index ef40b7073..3e7b49cc6 100644 --- a/fb/fbpseudocolor.c +++ b/fb/fbpseudocolor.c @@ -2,6 +2,8 @@ #include <dix-config.h> #endif +#include <string.h> + #include <X11/X.h> #include <X11/Xproto.h> #include "scrnintstr.h" diff --git a/fb/fbseg.c b/fb/fbseg.c index 18a996e0c..777ff7055 100644 --- a/fb/fbseg.c +++ b/fb/fbseg.c @@ -27,6 +27,8 @@ #include <dix-config.h> #endif +#include <stdlib.h> + #include "fb.h" #include "miline.h" diff --git a/fb/fbwindow.c b/fb/fbwindow.c index 7b96f18c3..d4046b5f1 100644 --- a/fb/fbwindow.c +++ b/fb/fbwindow.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/fb/fbwindow.c,v 1.8 2005/07/03 07:01:23 daniels Exp $ */ +/* $XdotOrg: xserver/xorg/fb/fbwindow.c,v 1.9 2005/10/02 08:28:26 anholt Exp $ */ /* * Id: fbwindow.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ * @@ -28,10 +28,9 @@ #include <dix-config.h> #endif +#include <stdlib.h> + #include "fb.h" -#ifdef IN_MODULE -#include "xf86_ansic.h" -#endif Bool fbCreateWindow(WindowPtr pWin) diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index d323f677b..39c8b8c59 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -52,10 +52,6 @@ #ifndef _COMPILER_H -# if !defined(_XF86_ANSIC_H) && defined(XFree86Module) -# error missing #include "xf86_ansic.h" before #include "compiler.h" -# endif - # define _COMPILER_H #if defined(__SUNPRO_C) diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index 010360cf3..5d9d61e8a 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -40,11 +40,7 @@ #include "xf86str.h" #include "xf86Opt.h" #include <X11/Xfuncproto.h> -#ifndef IN_MODULE #include <stdarg.h> -#else -#include "xf86_ansic.h" -#endif #ifdef RANDR #include <X11/extensions/randr.h> #endif diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c index c2b0f4aba..00e721053 100644 --- a/hw/xfree86/ddc/ddcProperty.c +++ b/hw/xfree86/ddc/ddcProperty.c @@ -9,9 +9,9 @@ #include <xorg-config.h> #endif +#include <string.h> #include "misc.h" #include "xf86.h" -/* #include "xf86_ansic.h" */ /* #include "xf86_OSproc.h" */ #include <X11/Xatom.h> #include "property.h" diff --git a/hw/xfree86/ddc/edid.c b/hw/xfree86/ddc/edid.c index ef4848eef..6d3b18c13 100644 --- a/hw/xfree86/ddc/edid.c +++ b/hw/xfree86/ddc/edid.c @@ -13,10 +13,10 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include "xf86DDC.h" #include "ddcPriv.h" +#include <string.h> static int find_start(unsigned int *); static unsigned char * find_header(unsigned char *); diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c index 59dae6cf3..718cbf77a 100644 --- a/hw/xfree86/ddc/interpret_edid.c +++ b/hw/xfree86/ddc/interpret_edid.c @@ -10,10 +10,10 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #define _PARSE_EDID_ #include "xf86DDC.h" +#include <string.h> static void get_vendor_section(Uchar*, struct vendor *); static void get_version_section(Uchar*, struct edid_version *); diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c index 1cec91283..2b96488e8 100644 --- a/hw/xfree86/ddc/print_edid.c +++ b/hw/xfree86/ddc/print_edid.c @@ -10,7 +10,6 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include "xf86DDC.h" diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c index 36b214644..c5b070dc7 100644 --- a/hw/xfree86/ddc/xf86DDC.c +++ b/hw/xfree86/ddc/xf86DDC.c @@ -10,10 +10,10 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include "xf86DDC.h" #include "ddcPriv.h" +#include <string.h> #ifdef XFree86LOADER static const OptionInfoRec *DDCAvailableOptions(void *unused); diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c index 3c2044f78..f71ce6168 100644 --- a/hw/xfree86/dixmods/extmod/modinit.c +++ b/hw/xfree86/dixmods/extmod/modinit.c @@ -28,7 +28,6 @@ #endif #ifdef XFree86LOADER -#include "xf86_ansic.h" #include "xf86Module.h" #include "xf86Opt.h" diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c index a5cab0f11..3ea19b431 100644 --- a/hw/xfree86/dixmods/extmod/xf86dga2.c +++ b/hw/xfree86/dixmods/extmod/xf86dga2.c @@ -30,11 +30,7 @@ #include "dgaproc.h" #include "xf86dgaext.h" -#ifdef EXTMODULE -#include "xf86_ansic.h" -#else #include <string.h> -#endif #include "modinit.h" diff --git a/hw/xfree86/dixmods/extmod/xf86misc.c b/hw/xfree86/dixmods/extmod/xf86misc.c index a5dc2e212..a35db1f2f 100644 --- a/hw/xfree86/dixmods/extmod/xf86misc.c +++ b/hw/xfree86/dixmods/extmod/xf86misc.c @@ -41,10 +41,6 @@ #endif /* USL */ #endif -#ifdef EXTMODULE -#include "xf86_ansic.h" -#endif - static int miscErrorBase; static int MiscGeneration = 0; static int MiscClientPrivateIndex; diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c index 50575cc05..2a3037c0e 100644 --- a/hw/xfree86/dixmods/extmod/xf86vmode.c +++ b/hw/xfree86/dixmods/extmod/xf86vmode.c @@ -29,7 +29,7 @@ or other dealings in this Software without prior written authorization from Kaleb S. KEITHLEY */ -/* $XdotOrg: xc/programs/Xserver/Xext/xf86vmode.c,v 1.4 2005/04/20 12:25:12 daniels Exp $ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/dixmods/extmod/xf86vmode.c,v 1.8 2005/07/16 03:49:58 kem Exp $ */ /* $Xorg: xf86vmode.c,v 1.3 2000/08/17 19:47:59 cpqbld Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */ @@ -52,10 +52,6 @@ from Kaleb S. KEITHLEY #include "xf86.h" #include "vidmodeproc.h" -#ifdef EXTMODULE -#include "xf86_ansic.h" -#endif - #define DEFAULT_XF86VIDMODE_VERBOSITY 3 static int VidModeErrorBase; diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index fdfa57557..72139dea6 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -39,12 +39,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #endif #include "xf86.h" -#ifdef XFree86LOADER -#include "xf86_ansic.h" -#else #include <sys/time.h> #include <unistd.h> -#endif #define NEED_REPLIES #define NEED_EVENTS diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c index 273ccda1b..4b0e35459 100644 --- a/hw/xfree86/dri/xf86dri.c +++ b/hw/xfree86/dri/xf86dri.c @@ -39,10 +39,9 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <xorg-config.h> #endif +#include <string.h> + #include "xf86.h" -#ifdef XFree86LOADER -#include "xf86_ansic.h" -#endif #define NEED_REPLIES #define NEED_EVENTS diff --git a/hw/xfree86/exa/exa_migration.c b/hw/xfree86/exa/exa_migration.c index 2acda24da..270ad7541 100644 --- a/hw/xfree86/exa/exa_migration.c +++ b/hw/xfree86/exa/exa_migration.c @@ -25,6 +25,9 @@ #ifdef HAVE_CONFIG_H #include <xorg-config.h> #endif + +#include <string.h> + #include "exa_priv.h" #include <X11/fonts/fontstruct.h> #include "dixfontstr.h" diff --git a/hw/xfree86/exa/exa_offscreen.c b/hw/xfree86/exa/exa_offscreen.c index b0b19f501..c3a2af642 100644 --- a/hw/xfree86/exa/exa_offscreen.c +++ b/hw/xfree86/exa/exa_offscreen.c @@ -22,6 +22,10 @@ #include "exa_priv.h" +#include <sys/limits.h> +#include <assert.h> +#include <stdlib.h> + #if DEBUG_OFFSCREEN #define DBG_OFFSCREEN(a) ErrorF a #else @@ -120,7 +124,7 @@ exaOffscreenAlloc (ScreenPtr pScreen, int size, int align, /* prev points at the first object to boot */ best = NULL; - best_score = MAXINT; + best_score = INT_MAX; for (begin = pExaScr->info->card.offScreenAreas; begin != NULL; begin = begin->next) { diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c index 3e7b1f66a..25779ed87 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.c +++ b/hw/xfree86/fbdevhw/fbdevhw.c @@ -7,7 +7,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" /* pci stuff */ #include "xf86PciInfo.h" diff --git a/hw/xfree86/i2c/bt829.c b/hw/xfree86/i2c/bt829.c index c9d144317..3963ecf47 100644 --- a/hw/xfree86/i2c/bt829.c +++ b/hw/xfree86/i2c/bt829.c @@ -4,6 +4,10 @@ #include <xorg-config.h> #endif +#include <stdlib.h> +#include <string.h> +#include <stdio.h> + #include "xf86.h" #include "xf86i2c.h" #include "bt829.h" diff --git a/hw/xfree86/i2c/fi1236.c b/hw/xfree86/i2c/fi1236.c index 299f20060..22a019499 100644 --- a/hw/xfree86/i2c/fi1236.c +++ b/hw/xfree86/i2c/fi1236.c @@ -1,9 +1,14 @@ -/* $XdotOrg: $ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/i2c/fi1236.c,v 1.8 2005/07/30 18:56:32 alanc Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif +#include <unistd.h> +#include <stdlib.h> +#include <string.h> +#include <math.h> + #include "xf86.h" #include "xf86i2c.h" #include "fi1236.h" diff --git a/hw/xfree86/i2c/msp3430.c b/hw/xfree86/i2c/msp3430.c index 91019fc8f..42f100e7c 100644 --- a/hw/xfree86/i2c/msp3430.c +++ b/hw/xfree86/i2c/msp3430.c @@ -2,6 +2,9 @@ #include <xorg-config.h> #endif +#include <string.h> +#include <unistd.h> + #include "xf86.h" #include "xf86i2c.h" #include "msp3430.h" diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c index d33ea97c1..9049fe4fd 100644 --- a/hw/xfree86/i2c/xf86i2c.c +++ b/hw/xfree86/i2c/xf86i2c.c @@ -12,13 +12,15 @@ #include <xorg-config.h> #endif -#if 1 +#include <sys/time.h> +#include <string.h> + #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> +#include <X11/Xos.h> #include <X11/Xproto.h> #include "scrnintstr.h" #include "regionstr.h" @@ -28,14 +30,6 @@ #include "resource.h" #include "gcstruct.h" #include "dixstruct.h" -#else -typedef int Bool; -typedef void *Pointer; -#define NULL ((void *)0) -#define X_DEFAULT 0 -#define TRUE 1 -#define FALSE 0 -#endif #include "xf86i2c.h" @@ -76,20 +70,19 @@ I2CUDelay(I2CBusPtr b, int usec) static void I2CUDelay(I2CBusPtr b, int usec) { - long b_secs, b_usecs; - long a_secs, a_usecs; + struct timeval begin, cur; long d_secs, d_usecs; long diff; if (usec > 0) { - xf86getsecs(&b_secs, &b_usecs); + X_GETTIMEOFDAY(&begin); do { /* It would be nice to use {xf86}usleep, * but usleep (1) takes >10000 usec ! */ - xf86getsecs(&a_secs, &a_usecs); - d_secs = (a_secs - b_secs); - d_usecs = (a_usecs - b_usecs); + X_GETTIMEOFDAY(&cur); + d_secs = (cur.tv_sec - begin.tv_sec); + d_usecs = (cur.tv_usec - begin.tv_usec); diff = d_secs*1000000 + d_usecs; } while (diff>=0 && diff< (usec + 1)); } diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c index e9ddd3334..a9ceebcb0 100644 --- a/hw/xfree86/int10/generic.c +++ b/hw/xfree86/int10/generic.c @@ -8,9 +8,11 @@ #include <xorg-config.h> #endif +#include <string.h> +#include <unistd.h> + #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "compiler.h" #define _INT10_PRIVATE #include "xf86int10.h" diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c index eae6b5378..1809e2d95 100644 --- a/hw/xfree86/int10/helper_exec.c +++ b/hw/xfree86/int10/helper_exec.c @@ -19,9 +19,11 @@ #include <xorg-config.h> #endif +#include <unistd.h> + +#include <X11/Xos.h> #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "compiler.h" #define _INT10_PRIVATE #include "int10Defines.h" @@ -342,13 +344,14 @@ x_inw(CARD16 port) CARD16 val; if (port == 0x5c) { + struct timeval tv; + /* * Emulate a PC98's timer. Typical resolution is 3.26 usec. * Approximate this by dividing by 3. */ - long sec, usec; - (void)getsecs(&sec, &usec); - val = (CARD16)(usec / 3); + X_GETTIMEOFDAY(&tv); + val = (CARD16)(tv.tv_usec / 3); } else { if (!pciCfg1inw(port, &val)) val = inw(Int10Current->ioBase + port); @@ -363,15 +366,15 @@ void x_outb(CARD16 port, CARD8 val) { if ((port == 0x43) && (val == 0)) { + struct timeval tv; /* * Emulate a PC's timer 0. Such timers typically have a resolution of * some .838 usec per tick, but this can only provide 1 usec per tick. * (Not that this matters much, given inherent emulation delays.) Use * the bottom bit as a byte select. See inb(0x40) above. */ - long sec, usec; - (void) getsecs(&sec, &usec); - Int10Current->inb40time = (CARD16)(usec | 1); + X_GETTIMEOFDAY(&tv); + Int10Current->inb40time = (CARD16)(tv.tv_usec | 1); #ifdef PRINT_PORT ErrorF(" outb(%#x, %2.2x)\n", port, val); #endif diff --git a/hw/xfree86/int10/helper_mem.c b/hw/xfree86/int10/helper_mem.c index 495a0e04d..65ffe3df5 100644 --- a/hw/xfree86/int10/helper_mem.c +++ b/hw/xfree86/int10/helper_mem.c @@ -8,9 +8,11 @@ #include <xorg-config.h> #endif +#include <string.h> +#include <stdlib.h> + #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "compiler.h" #include "xf86Pci.h" #define _INT10_PRIVATE diff --git a/hw/xfree86/int10/pci.c b/hw/xfree86/int10/pci.c index f35bd7233..520df1495 100644 --- a/hw/xfree86/int10/pci.c +++ b/hw/xfree86/int10/pci.c @@ -9,9 +9,10 @@ #include <xorg-config.h> #endif +#include <string.h> + #include "xf86Pci.h" #include "xf86.h" -#include "xf86_ansic.h" #define _INT10_PRIVATE #include "xf86int10.h" diff --git a/hw/xfree86/int10/x86emu.c b/hw/xfree86/int10/x86emu.c index b9580a1de..b3320e5b9 100644 --- a/hw/xfree86/int10/x86emu.c +++ b/hw/xfree86/int10/x86emu.c @@ -3,10 +3,6 @@ #include <xorg-config.h> #endif -#ifdef NO_SYS_HEADERS -# include "xf86_ansic.h" -#endif - #include "debug.c" #include "decode.c" #include "fpu.c" diff --git a/hw/xfree86/int10/xf86int10.c b/hw/xfree86/int10/xf86int10.c index 06cf40b8c..303cf8925 100644 --- a/hw/xfree86/int10/xf86int10.c +++ b/hw/xfree86/int10/xf86int10.c @@ -10,7 +10,6 @@ #endif #include "xf86.h" -#include "xf86_ansic.h" #include "compiler.h" #define _INT10_PRIVATE #include "xf86int10.h" diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c index c15a5f9be..62a34e3aa 100644 --- a/hw/xfree86/int10/xf86x86emu.c +++ b/hw/xfree86/int10/xf86x86emu.c @@ -10,11 +10,9 @@ #include <x86emu.h> #include "xf86.h" -#include "xf86_ansic.h" #include "compiler.h" #include "xf86_OSproc.h" #include "xf86Pci.h" -#include "xf86_libc.h" #define _INT10_PRIVATE #include "xf86int10.h" #include "int10Defines.h" diff --git a/hw/xfree86/os-support/bsd/bsd_jstk.c b/hw/xfree86/os-support/bsd/bsd_jstk.c index 00f457b88..bc99f2914 100644 --- a/hw/xfree86/os-support/bsd/bsd_jstk.c +++ b/hw/xfree86/os-support/bsd/bsd_jstk.c @@ -38,7 +38,6 @@ #ifdef XFree86LOADER #include "misc.h" -#include "xf86_libc.h" #endif #include "xf86.h" diff --git a/hw/xfree86/os-support/bsd/bsd_kmod.c b/hw/xfree86/os-support/bsd/bsd_kmod.c index ecaf78028..e3c4bb77c 100644 --- a/hw/xfree86/os-support/bsd/bsd_kmod.c +++ b/hw/xfree86/os-support/bsd/bsd_kmod.c @@ -11,7 +11,6 @@ #include <sys/linker.h> #include "xf86_OSproc.h" -#include "xf86_ansic.h" /* * Load a FreeBSD kernel module. diff --git a/hw/xfree86/os-support/drm/xf86drm.c b/hw/xfree86/os-support/drm/xf86drm.c index 0980e7884..a4663048b 100644 --- a/hw/xfree86/os-support/drm/xf86drm.c +++ b/hw/xfree86/os-support/drm/xf86drm.c @@ -40,39 +40,33 @@ #ifdef XFree86Server # include "xf86.h" # include "xf86_OSproc.h" -# include "drm.h" -# include "xf86_ansic.h" # define _DRM_MALLOC xalloc # define _DRM_FREE xfree # ifndef XFree86LOADER # include <sys/mman.h> # endif #else -# include <stdio.h> -# include <stdlib.h> -# include <unistd.h> -# include <string.h> -# include <ctype.h> -# include <fcntl.h> -# include <errno.h> -# include <signal.h> -# include <sys/types.h> -# include <sys/stat.h> -# define stat_t struct stat -# include <sys/ioctl.h> -# include <sys/mman.h> -# include <sys/time.h> -# include <stdarg.h> -# ifdef DRM_USE_MALLOC -# define _DRM_MALLOC malloc -# define _DRM_FREE free -# else -# define _DRM_MALLOC malloc -# define _DRM_FREE free -# endif -# include "drm.h" +# define _DRM_MALLOC malloc +# define _DRM_FREE free #endif +#include "drm.h" +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <string.h> +#include <ctype.h> +#include <fcntl.h> +#include <errno.h> +#include <signal.h> +#include <sys/types.h> +#include <sys/stat.h> +#define stat_t struct stat +#include <sys/ioctl.h> +#include <sys/mman.h> +#include <sys/time.h> +#include <stdarg.h> + /* No longer needed with CVS kernel modules on alpha #if defined(__alpha__) && defined(__linux__) extern unsigned long _bus_base(void); diff --git a/hw/xfree86/os-support/drm/xf86drmHash.c b/hw/xfree86/os-support/drm/xf86drmHash.c index 4fbc88a12..a2567080a 100644 --- a/hw/xfree86/os-support/drm/xf86drmHash.c +++ b/hw/xfree86/os-support/drm/xf86drmHash.c @@ -76,18 +76,13 @@ #define HASH_MAIN 0 -#if HASH_MAIN -# include <stdio.h> -# include <stdlib.h> -#else +#include <stdio.h> +#include <stdlib.h> +#if !HASH_MAIN # include "drm.h" # include "xf86drm.h" # ifdef XFree86LOADER # include "xf86.h" -# include "xf86_ansic.h" -# else -# include <stdio.h> -# include <stdlib.h> # endif #endif diff --git a/hw/xfree86/os-support/drm/xf86drmRandom.c b/hw/xfree86/os-support/drm/xf86drmRandom.c index 301aaf4c2..cc40dccad 100644 --- a/hw/xfree86/os-support/drm/xf86drmRandom.c +++ b/hw/xfree86/os-support/drm/xf86drmRandom.c @@ -79,18 +79,13 @@ #define RANDOM_MAIN 0 -#if RANDOM_MAIN -# include <stdio.h> -# include <stdlib.h> -#else +#include <stdio.h> +#include <stdlib.h> +#if !RANDOM_MAIN # include "drm.h" # include "xf86drm.h" # ifdef XFree86LOADER # include "xf86.h" -# include "xf86_ansic.h" -# else -# include <stdio.h> -# include <stdlib.h> # endif #endif diff --git a/hw/xfree86/os-support/drm/xf86drmSL.c b/hw/xfree86/os-support/drm/xf86drmSL.c index 5f3c88d23..23283a950 100644 --- a/hw/xfree86/os-support/drm/xf86drmSL.c +++ b/hw/xfree86/os-support/drm/xf86drmSL.c @@ -55,7 +55,6 @@ # include "xf86drm.h" # ifdef XFree86LOADER # include "xf86.h" -# include "xf86_ansic.h" # else # include <stdio.h> # include <stdlib.h> diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c index b8e821cd1..69df3118e 100644 --- a/hw/xfree86/os-support/linux/int10/linux.c +++ b/hw/xfree86/os-support/linux/int10/linux.c @@ -9,7 +9,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Pci.h" #include "compiler.h" #define _INT10_PRIVATE diff --git a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c index e99cde8da..05d40a37b 100644 --- a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c +++ b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c @@ -6,7 +6,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Pci.h" #include "compiler.h" #define _INT10_PRIVATE diff --git a/hw/xfree86/os-support/linux/lnx_jstk.c b/hw/xfree86/os-support/linux/lnx_jstk.c index dafdc0594..667586359 100644 --- a/hw/xfree86/os-support/linux/lnx_jstk.c +++ b/hw/xfree86/os-support/linux/lnx_jstk.c @@ -42,7 +42,6 @@ static const char rcs_id[] = "Id: lnx_jstk.c,v 1.1 1995/12/20 14:06:09 lepied Ex #ifdef XFree86LOADER #include "xf86.h" -#include "xf86_ansic.h" #endif #if !defined(JSIOCGTIMELIMIT) diff --git a/hw/xfree86/rac/xf86RAC.c b/hw/xfree86/rac/xf86RAC.c index 243bcfbbc..05ea7ac7d 100644 --- a/hw/xfree86/rac/xf86RAC.c +++ b/hw/xfree86/rac/xf86RAC.c @@ -6,7 +6,6 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/ramdac/BT.c b/hw/xfree86/ramdac/BT.c index 346b902dd..5c3139d91 100644 --- a/hw/xfree86/ramdac/BT.c +++ b/hw/xfree86/ramdac/BT.c @@ -31,7 +31,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #define INIT_BT_RAMDAC_INFO #include "BTPriv.h" diff --git a/hw/xfree86/ramdac/IBM.c b/hw/xfree86/ramdac/IBM.c index bf9b729d8..42bff44a9 100644 --- a/hw/xfree86/ramdac/IBM.c +++ b/hw/xfree86/ramdac/IBM.c @@ -31,7 +31,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Cursor.h" diff --git a/hw/xfree86/ramdac/TI.c b/hw/xfree86/ramdac/TI.c index e945dab10..390bc6b7b 100644 --- a/hw/xfree86/ramdac/TI.c +++ b/hw/xfree86/ramdac/TI.c @@ -32,7 +32,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86Cursor.h" diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c index 460914d5e..a930cdd8e 100644 --- a/hw/xfree86/ramdac/xf86Cursor.c +++ b/hw/xfree86/ramdac/xf86Cursor.c @@ -5,7 +5,6 @@ #endif #include "xf86.h" -#include "xf86_ansic.h" #include "xf86CursorPriv.h" #include "colormapst.h" #include "cursorstr.h" diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c index 83e6e4611..aef1c8bb1 100644 --- a/hw/xfree86/ramdac/xf86HWCurs.c +++ b/hw/xfree86/ramdac/xf86HWCurs.c @@ -4,9 +4,10 @@ #include <xorg-config.h> #endif +#include <string.h> + #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/ramdac/xf86RamDac.c b/hw/xfree86/ramdac/xf86RamDac.c index 1182a3e39..e0314f6b7 100644 --- a/hw/xfree86/ramdac/xf86RamDac.c +++ b/hw/xfree86/ramdac/xf86RamDac.c @@ -31,7 +31,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "xf86RamDacPriv.h" diff --git a/hw/xfree86/ramdac/xf86RamDacCmap.c b/hw/xfree86/ramdac/xf86RamDacCmap.c index 6a59b4bb7..04f50f166 100644 --- a/hw/xfree86/ramdac/xf86RamDacCmap.c +++ b/hw/xfree86/ramdac/xf86RamDacCmap.c @@ -36,7 +36,6 @@ #include "micmap.h" #include "xf86.h" -#include "xf86_ansic.h" #include "compiler.h" #include "colormapst.h" #include "xf86RamDacPriv.h" diff --git a/hw/xfree86/scanpci/xf86ScanPci.c b/hw/xfree86/scanpci/xf86ScanPci.c index 91455d412..d321a5b79 100644 --- a/hw/xfree86/scanpci/xf86ScanPci.c +++ b/hw/xfree86/scanpci/xf86ScanPci.c @@ -62,12 +62,8 @@ #include "xf86Pci.h" #include "xf86_OSproc.h" -#ifndef IN_MODULE #include <ctype.h> #include <stdlib.h> -#else -#include <xf86_ansic.h> -#endif #ifndef PCIDATA #define VENDOR_INCLUDE_NONVIDEO diff --git a/hw/xfree86/utils/xorgcfg/loader.h b/hw/xfree86/utils/xorgcfg/loader.h index 8e4da34c3..92ca70485 100644 --- a/hw/xfree86/utils/xorgcfg/loader.h +++ b/hw/xfree86/utils/xorgcfg/loader.h @@ -55,7 +55,6 @@ #include "loaderProcs.h" #include <sym.h> -#include <xf86_ansic.h> void LoaderDefaultFunc(void); #endif diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c index b69a82b4e..521deb479 100644 --- a/hw/xfree86/vbe/vbe.c +++ b/hw/xfree86/vbe/vbe.c @@ -14,8 +14,9 @@ #include <xorg-config.h> #endif +#include <string.h> + #include "xf86.h" -#include "xf86_ansic.h" #include "vbe.h" #include <X11/Xarch.h> #define DPMS_SERVER diff --git a/hw/xfree86/vbe/vbeModes.c b/hw/xfree86/vbe/vbeModes.c index 678f8e120..436a8a8dd 100644 --- a/hw/xfree86/vbe/vbeModes.c +++ b/hw/xfree86/vbe/vbeModes.c @@ -34,8 +34,10 @@ #include <xorg-config.h> #endif +#include <stdio.h> +#include <string.h> + #include "xf86.h" -#include "xf86_ansic.h" #include "vbe.h" #include "vbeModes.h" diff --git a/hw/xfree86/vgahw/vgaCmap.c b/hw/xfree86/vgahw/vgaCmap.c index 85f8bbdb8..d3f6d427d 100644 --- a/hw/xfree86/vgahw/vgaCmap.c +++ b/hw/xfree86/vgahw/vgaCmap.c @@ -37,7 +37,6 @@ #include "xf86.h" #include "vgaHW.h" -#include "xf86_ansic.h" #define _XF86DGA_SERVER_ #include <X11/extensions/xf86dgastr.h> diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c index 8b98190cb..6df7dee18 100644 --- a/hw/xfree86/vgahw/vgaHW.c +++ b/hw/xfree86/vgahw/vgaHW.c @@ -16,12 +16,15 @@ #include <xorg-config.h> #endif +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + #include <X11/X.h> #include "misc.h" #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86_ansic.h" #include "vgaHW.h" #include "compiler.h" diff --git a/hw/xfree86/x86emu/decode.c b/hw/xfree86/x86emu/decode.c index 25415d9fa..9339f4c7f 100644 --- a/hw/xfree86/x86emu/decode.c +++ b/hw/xfree86/x86emu/decode.c @@ -37,7 +37,7 @@ * ****************************************************************************/ - +#include <stdlib.h> #include "x86emu/x86emui.h" /*----------------------------- Implementation ----------------------------*/ diff --git a/hw/xfree86/x86emu/prim_ops.c b/hw/xfree86/x86emu/prim_ops.c index 56ab8cc9a..461e09e3e 100644 --- a/hw/xfree86/x86emu/prim_ops.c +++ b/hw/xfree86/x86emu/prim_ops.c @@ -97,6 +97,8 @@ * ****************************************************************************/ +#include <stdlib.h> + #define PRIM_OPS_NO_REDEFINE_ASM #include "x86emu/x86emui.h" diff --git a/hw/xfree86/xaa/xaaBitBlt.c b/hw/xfree86/xaa/xaaBitBlt.c index de0244848..3639ec787 100644 --- a/hw/xfree86/xaa/xaaBitBlt.c +++ b/hw/xfree86/xaa/xaaBitBlt.c @@ -13,7 +13,6 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/xaa/xaaBitmap.c b/hw/xfree86/xaa/xaaBitmap.c index b3f00d696..940525927 100644 --- a/hw/xfree86/xaa/xaaBitmap.c +++ b/hw/xfree86/xaa/xaaBitmap.c @@ -9,8 +9,6 @@ #include "xaalocal.h" #include "xaacexp.h" #include "xf86.h" -#include "xf86_ansic.h" - /********** byte swapping ***************/ diff --git a/hw/xfree86/xaa/xaaCpyArea.c b/hw/xfree86/xaa/xaaCpyArea.c index 8d5bbf9aa..2fe3ab1c3 100644 --- a/hw/xfree86/xaa/xaaCpyArea.c +++ b/hw/xfree86/xaa/xaaCpyArea.c @@ -6,7 +6,6 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/xaa/xaaCpyPlane.c b/hw/xfree86/xaa/xaaCpyPlane.c index b60ba3f83..95a22adf5 100644 --- a/hw/xfree86/xaa/xaaCpyPlane.c +++ b/hw/xfree86/xaa/xaaCpyPlane.c @@ -14,9 +14,10 @@ #include <xorg-config.h> #endif +#include <string.h> + #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include "servermd.h" diff --git a/hw/xfree86/xaa/xaaCpyWin.c b/hw/xfree86/xaa/xaaCpyWin.c index e50e88f91..198f8e95c 100644 --- a/hw/xfree86/xaa/xaaCpyWin.c +++ b/hw/xfree86/xaa/xaaCpyWin.c @@ -6,7 +6,6 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/xaa/xaaDashLine.c b/hw/xfree86/xaa/xaaDashLine.c index 059804c70..22645ea1b 100644 --- a/hw/xfree86/xaa/xaaDashLine.c +++ b/hw/xfree86/xaa/xaaDashLine.c @@ -4,10 +4,11 @@ #include <xorg-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include "scrnintstr.h" diff --git a/hw/xfree86/xaa/xaaFallback.c b/hw/xfree86/xaa/xaaFallback.c index 2f8851c38..da7a38ea9 100644 --- a/hw/xfree86/xaa/xaaFallback.c +++ b/hw/xfree86/xaa/xaaFallback.c @@ -6,7 +6,6 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/xaa/xaaFillArc.c b/hw/xfree86/xaa/xaaFillArc.c index 4c4f0d38d..6d4a5dccf 100644 --- a/hw/xfree86/xaa/xaaFillArc.c +++ b/hw/xfree86/xaa/xaaFillArc.c @@ -38,9 +38,10 @@ #include <xorg-config.h> #endif +#include <sys/limits.h> + #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> @@ -201,7 +202,7 @@ XAAPolyFillArcSolid(pDraw, pGC, narcs, parcs) box.x2 = x2; y2 = box.y1 + (int)arc->height + 1; box.y2 = y2; - if ( (x2 <= MAXSHORT) && (y2 <= MAXSHORT) && + if ( (x2 <= SHRT_MAX) && (y2 <= SHRT_MAX) && (RECT_IN_REGION(pDraw->pScreen, cclip, &box) == rgnIN) ) { if ((arc->angle2 >= FULLCIRCLE) || diff --git a/hw/xfree86/xaa/xaaFillPoly.c b/hw/xfree86/xaa/xaaFillPoly.c index 55177d319..26a2646e7 100644 --- a/hw/xfree86/xaa/xaaFillPoly.c +++ b/hw/xfree86/xaa/xaaFillPoly.c @@ -37,7 +37,6 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/xaa/xaaFillRect.c b/hw/xfree86/xaa/xaaFillRect.c index bf6328272..1bd7bd14d 100644 --- a/hw/xfree86/xaa/xaaFillRect.c +++ b/hw/xfree86/xaa/xaaFillRect.c @@ -6,7 +6,6 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c index 83df2a0e2..31f084e7e 100644 --- a/hw/xfree86/xaa/xaaGC.c +++ b/hw/xfree86/xaa/xaaGC.c @@ -4,9 +4,10 @@ #include <xorg-config.h> #endif +#include <string.h> + #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/xaa/xaaGCmisc.c b/hw/xfree86/xaa/xaaGCmisc.c index 5c04e2266..5a6a0abce 100644 --- a/hw/xfree86/xaa/xaaGCmisc.c +++ b/hw/xfree86/xaa/xaaGCmisc.c @@ -6,7 +6,6 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/xaa/xaaImage.c b/hw/xfree86/xaa/xaaImage.c index b87cc4eec..a0d7bfb7a 100644 --- a/hw/xfree86/xaa/xaaImage.c +++ b/hw/xfree86/xaa/xaaImage.c @@ -6,7 +6,6 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include "servermd.h" diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c index 15132560d..f29a2eb3a 100644 --- a/hw/xfree86/xaa/xaaInit.c +++ b/hw/xfree86/xaa/xaaInit.c @@ -6,7 +6,6 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c index 8f4043537..861410b6d 100644 --- a/hw/xfree86/xaa/xaaInitAccel.c +++ b/hw/xfree86/xaa/xaaInitAccel.c @@ -4,9 +4,10 @@ #include <xorg-config.h> #endif +#include <string.h> + #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/xaa/xaaLine.c b/hw/xfree86/xaa/xaaLine.c index 2314869cf..c6b78307a 100644 --- a/hw/xfree86/xaa/xaaLine.c +++ b/hw/xfree86/xaa/xaaLine.c @@ -4,10 +4,11 @@ #include <xorg-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include "scrnintstr.h" diff --git a/hw/xfree86/xaa/xaaLineMisc.c b/hw/xfree86/xaa/xaaLineMisc.c index 7f39229f8..7bb312971 100644 --- a/hw/xfree86/xaa/xaaLineMisc.c +++ b/hw/xfree86/xaa/xaaLineMisc.c @@ -6,7 +6,6 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/xaa/xaaNonTEGlyph.c b/hw/xfree86/xaa/xaaNonTEGlyph.c index 75318e51c..881707396 100644 --- a/hw/xfree86/xaa/xaaNonTEGlyph.c +++ b/hw/xfree86/xaa/xaaNonTEGlyph.c @@ -9,7 +9,6 @@ #include "xaalocal.h" #include "xaacexp.h" #include "xf86.h" -#include "xf86_ansic.h" /* Not used anymore because the algorithm isn't correct. It doesn't handle overlapping characters properly */ diff --git a/hw/xfree86/xaa/xaaNonTEText.c b/hw/xfree86/xaa/xaaNonTEText.c index 0d0d8cf11..8c62af477 100644 --- a/hw/xfree86/xaa/xaaNonTEText.c +++ b/hw/xfree86/xaa/xaaNonTEText.c @@ -22,9 +22,10 @@ #include <xorg-config.h> #endif +#include <string.h> + #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/xaa/xaaOffscreen.c b/hw/xfree86/xaa/xaaOffscreen.c index d227579a9..d1c737c06 100644 --- a/hw/xfree86/xaa/xaaOffscreen.c +++ b/hw/xfree86/xaa/xaaOffscreen.c @@ -13,7 +13,6 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/xaa/xaaOverlay.c b/hw/xfree86/xaa/xaaOverlay.c index 12d2a959b..53a0827e2 100644 --- a/hw/xfree86/xaa/xaaOverlay.c +++ b/hw/xfree86/xaa/xaaOverlay.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.3 2005/04/20 12:25:39 daniels Exp $ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/xaa/xaaOverlay.c,v 1.6 2005/07/03 08:53:49 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.14tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H @@ -7,7 +7,6 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/xaa/xaaOverlayDF.c b/hw/xfree86/xaa/xaaOverlayDF.c index 0cfd46f50..883e94e6e 100644 --- a/hw/xfree86/xaa/xaaOverlayDF.c +++ b/hw/xfree86/xaa/xaaOverlayDF.c @@ -12,7 +12,6 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/xaa/xaaPCache.c b/hw/xfree86/xaa/xaaPCache.c index a4fadb9aa..b8dd77465 100644 --- a/hw/xfree86/xaa/xaaPCache.c +++ b/hw/xfree86/xaa/xaaPCache.c @@ -4,9 +4,10 @@ #include <xorg-config.h> #endif +#include <string.h> + #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/xaa/xaaPaintWin.c b/hw/xfree86/xaa/xaaPaintWin.c index 041ee1831..4a82b49c5 100644 --- a/hw/xfree86/xaa/xaaPaintWin.c +++ b/hw/xfree86/xaa/xaaPaintWin.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.3 2005/04/20 12:25:39 daniels Exp $ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/xaa/xaaPaintWin.c,v 1.6 2005/07/03 08:53:49 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.10 2001/10/28 03:34:04 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H @@ -7,7 +7,6 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/xaa/xaaPict.c b/hw/xfree86/xaa/xaaPict.c index 60cfe0843..847ccb2e0 100644 --- a/hw/xfree86/xaa/xaaPict.c +++ b/hw/xfree86/xaa/xaaPict.c @@ -26,9 +26,10 @@ #include <xorg-config.h> #endif +#include <string.h> + #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/xaa/xaaROP.c b/hw/xfree86/xaa/xaaROP.c index 80e700153..f6aacb85e 100644 --- a/hw/xfree86/xaa/xaaROP.c +++ b/hw/xfree86/xaa/xaaROP.c @@ -7,7 +7,6 @@ #include <X11/X.h> #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include "scrnintstr.h" diff --git a/hw/xfree86/xaa/xaaRect.c b/hw/xfree86/xaa/xaaRect.c index b176e51fd..1c56d80dc 100644 --- a/hw/xfree86/xaa/xaaRect.c +++ b/hw/xfree86/xaa/xaaRect.c @@ -6,7 +6,6 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/xaa/xaaSpans.c b/hw/xfree86/xaa/xaaSpans.c index 315024ef3..150991d7b 100644 --- a/hw/xfree86/xaa/xaaSpans.c +++ b/hw/xfree86/xaa/xaaSpans.c @@ -6,7 +6,6 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/xaa/xaaStateChange.c b/hw/xfree86/xaa/xaaStateChange.c index c0dd6da3e..86c12cc7e 100644 --- a/hw/xfree86/xaa/xaaStateChange.c +++ b/hw/xfree86/xaa/xaaStateChange.c @@ -6,7 +6,6 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/xaa/xaaStipple.c b/hw/xfree86/xaa/xaaStipple.c index 02a2b32ce..7ea9a2dc2 100644 --- a/hw/xfree86/xaa/xaaStipple.c +++ b/hw/xfree86/xaa/xaaStipple.c @@ -8,7 +8,6 @@ #include "xaalocal.h" #include "xaacexp.h" #include "xf86.h" -#include "xf86_ansic.h" static CARD32* StipplePowerOfTwo(CARD32*, CARD32*, int, int, int); static CARD32* StipplePowerOfTwo_Inverted(CARD32*, CARD32*, int, int, int); diff --git a/hw/xfree86/xaa/xaaTEGlyph.c b/hw/xfree86/xaa/xaaTEGlyph.c index 187a9dc61..f755ed9a9 100644 --- a/hw/xfree86/xaa/xaaTEGlyph.c +++ b/hw/xfree86/xaa/xaaTEGlyph.c @@ -9,8 +9,6 @@ #include "xaalocal.h" #include "xaacexp.h" #include "xf86.h" -#include "xf86_ansic.h" - /* scanline function for TRIPLE_BITS_24BPP */ static CARD32 *DrawTextScanline3(CARD32 *base, CARD32 *mem, int width); diff --git a/hw/xfree86/xaa/xaaTEText.c b/hw/xfree86/xaa/xaaTEText.c index 2c1e257cd..72e1858f6 100644 --- a/hw/xfree86/xaa/xaaTEText.c +++ b/hw/xfree86/xaa/xaaTEText.c @@ -24,7 +24,6 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/xaa/xaaWideLine.c b/hw/xfree86/xaa/xaaWideLine.c index 481ff8cc3..fbec29e7d 100644 --- a/hw/xfree86/xaa/xaaWideLine.c +++ b/hw/xfree86/xaa/xaaWideLine.c @@ -1,5 +1,5 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.10 2001/11/16 16:47:56 dawes Exp $ */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.4 2005/04/20 12:25:40 daniels Exp $ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/xaa/xaaWideLine.c,v 1.7 2005/07/03 08:53:49 daniels Exp $ */ /* XAAPolylinesWideSolid does not maintain a span list and subsequently does @@ -18,20 +18,10 @@ Original mi code written by Keith Packard. #include <xorg-config.h> #endif -#ifndef XFree86LOADER -#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \ - || (defined(sun) && defined(__SVR4)) #include <math.h> -#else -#define _XOPEN_SOURCE /* to get prototype for hypot on some systems */ -#include <math.h> -#undef _XOPEN_SOURCE -#endif -#endif #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/hw/xfree86/xf4bpp/OScompiler.h b/hw/xfree86/xf4bpp/OScompiler.h index cff5d9d3f..cc4266c3a 100644 --- a/hw/xfree86/xf4bpp/OScompiler.h +++ b/hw/xfree86/xf4bpp/OScompiler.h @@ -36,7 +36,6 @@ #define ABS(x) (((x)>0)?(x):-(x)) #include "misc.h" -#include "xf86_ansic.h" #include "compiler.h" #ifdef lint diff --git a/hw/xfree86/xf4bpp/mfbline.c b/hw/xfree86/xf4bpp/mfbline.c index 6d85f68c1..5df58a7e4 100644 --- a/hw/xfree86/xf4bpp/mfbline.c +++ b/hw/xfree86/xf4bpp/mfbline.c @@ -53,6 +53,8 @@ SOFTWARE. #include <xorg-config.h> #endif +#include <stdlib.h> + #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" diff --git a/hw/xfree86/xf4bpp/ppcClip.c b/hw/xfree86/xf4bpp/ppcClip.c index fe690555f..9166bf256 100644 --- a/hw/xfree86/xf4bpp/ppcClip.c +++ b/hw/xfree86/xf4bpp/ppcClip.c @@ -74,6 +74,8 @@ SOFTWARE. #include <xorg-config.h> #endif +#include <stdlib.h> + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/ppcCpArea.c b/hw/xfree86/xf4bpp/ppcCpArea.c index 4673fe7ac..e33795c77 100644 --- a/hw/xfree86/xf4bpp/ppcCpArea.c +++ b/hw/xfree86/xf4bpp/ppcCpArea.c @@ -51,6 +51,8 @@ SOFTWARE. #include <xorg-config.h> #endif +#include <stdlib.h> + #include "xf4bpp.h" #include "mfbmap.h" #define PSZ 8 diff --git a/hw/xfree86/xf4bpp/ppcGC.c b/hw/xfree86/xf4bpp/ppcGC.c index 9877b4bba..6197fc6af 100644 --- a/hw/xfree86/xf4bpp/ppcGC.c +++ b/hw/xfree86/xf4bpp/ppcGC.c @@ -75,6 +75,8 @@ SOFTWARE. #include <xorg-config.h> #endif +#include <stdlib.h> + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/ppcIO.c b/hw/xfree86/xf4bpp/ppcIO.c index 67eadfbf0..20b08ce9a 100644 --- a/hw/xfree86/xf4bpp/ppcIO.c +++ b/hw/xfree86/xf4bpp/ppcIO.c @@ -54,6 +54,8 @@ SOFTWARE. #include <xorg-config.h> #endif +#include <stdlib.h> + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/ppcImg.c b/hw/xfree86/xf4bpp/ppcImg.c index 71fcf38b1..ab8774216 100644 --- a/hw/xfree86/xf4bpp/ppcImg.c +++ b/hw/xfree86/xf4bpp/ppcImg.c @@ -28,6 +28,8 @@ #include <xorg-config.h> #endif +#include <stdlib.h> + #include "xf4bpp.h" #include "OScompiler.h" #include "mi.h" diff --git a/hw/xfree86/xf4bpp/ppcPixmap.c b/hw/xfree86/xf4bpp/ppcPixmap.c index 011dc56ff..0ccefcbd6 100644 --- a/hw/xfree86/xf4bpp/ppcPixmap.c +++ b/hw/xfree86/xf4bpp/ppcPixmap.c @@ -75,6 +75,8 @@ SOFTWARE. #include <xorg-config.h> #endif +#include <string.h> + #include "xf4bpp.h" #include "servermd.h" #include "OScompiler.h" diff --git a/hw/xfree86/xf4bpp/ppcSetSp.c b/hw/xfree86/xf4bpp/ppcSetSp.c index 7d560988a..ffdc5d970 100644 --- a/hw/xfree86/xf4bpp/ppcSetSp.c +++ b/hw/xfree86/xf4bpp/ppcSetSp.c @@ -75,6 +75,8 @@ SOFTWARE. #include <xorg-config.h> #endif +#include <stdlib.h> + #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" diff --git a/hw/xfree86/xf4bpp/ppcWindow.c b/hw/xfree86/xf4bpp/ppcWindow.c index 4cf8ea3cb..a2e910b1c 100644 --- a/hw/xfree86/xf4bpp/ppcWindow.c +++ b/hw/xfree86/xf4bpp/ppcWindow.c @@ -74,6 +74,8 @@ SOFTWARE. #include <xorg-config.h> #endif +#include <stdlib.h> + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf8_32bpp/cfbcpyarea.c b/hw/xfree86/xf8_32bpp/cfbcpyarea.c index 1a17220ab..6958861ec 100644 --- a/hw/xfree86/xf8_32bpp/cfbcpyarea.c +++ b/hw/xfree86/xf8_32bpp/cfbcpyarea.c @@ -4,6 +4,8 @@ #include <xorg-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/hw/xfree86/xf8_32bpp/cfbgcmisc.c b/hw/xfree86/xf8_32bpp/cfbgcmisc.c index 356b6cc9f..3d1af095a 100644 --- a/hw/xfree86/xf8_32bpp/cfbgcmisc.c +++ b/hw/xfree86/xf8_32bpp/cfbgcmisc.c @@ -4,6 +4,8 @@ #include <xorg-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/hw/xfree86/xf8_32bpp/cfbimage.c b/hw/xfree86/xf8_32bpp/cfbimage.c index 8b0ea4a78..8220636a1 100644 --- a/hw/xfree86/xf8_32bpp/cfbimage.c +++ b/hw/xfree86/xf8_32bpp/cfbimage.c @@ -4,6 +4,8 @@ #include <xorg-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include "windowstr.h" #include "pixmapstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfbwindow.c b/hw/xfree86/xf8_32bpp/cfbwindow.c index 78d721495..d2d4cfb6b 100644 --- a/hw/xfree86/xf8_32bpp/cfbwindow.c +++ b/hw/xfree86/xf8_32bpp/cfbwindow.c @@ -5,6 +5,8 @@ #include <xorg-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" diff --git a/hw/xfree86/xf8_32bpp/xf86overlay.c b/hw/xfree86/xf8_32bpp/xf86overlay.c index 2766bf871..c02e9b5d4 100644 --- a/hw/xfree86/xf8_32bpp/xf86overlay.c +++ b/hw/xfree86/xf8_32bpp/xf86overlay.c @@ -12,7 +12,6 @@ #include "misc.h" #include "xf86.h" -#include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> diff --git a/include/os.h b/include/os.h index 0b3354eec..8c46ec943 100644 --- a/include/os.h +++ b/include/os.h @@ -55,11 +55,7 @@ SOFTWARE. #define ALLOCATE_LOCAL_FALLBACK(_size) Xalloc((unsigned long)(_size)) #define DEALLOCATE_LOCAL_FALLBACK(_ptr) Xfree((pointer)(_ptr)) #include <X11/Xalloca.h> -#ifndef IN_MODULE #include <stdarg.h> -#else -#include "xf86_ansic.h" -#endif #define NullFID ((FID) 0) @@ -1147,12 +1147,5 @@ than a switch on the rop per item (span or rectangle.) #define MFB_OP_WHITE /* nothing */ #define MFB_OP_BLACK ~ -/* - * if MFB is built as a module, it shouldn't call libc functions. - */ -#ifdef XFree86LOADER -#include "xf86_ansic.h" -#endif - #endif /* MFB_PROTOTYPES_ONLY */ #endif /* _MFB_H_ */ diff --git a/mfb/mfbbitblt.c b/mfb/mfbbitblt.c index 70e2a9934..58468e3e5 100644 --- a/mfb/mfbbitblt.c +++ b/mfb/mfbbitblt.c @@ -54,6 +54,8 @@ SOFTWARE. #include <X11/X.h> #include <X11/Xprotostr.h> +#include <stdlib.h> + #include "regionstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/mfb/mfbblt.c b/mfb/mfbblt.c index ce77fe22c..e66ab6090 100644 --- a/mfb/mfbblt.c +++ b/mfb/mfbblt.c @@ -36,6 +36,8 @@ Author: Keith Packard #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/mfb/mfbclip.c b/mfb/mfbclip.c index 5501f0d5c..2b8a9cea2 100644 --- a/mfb/mfbclip.c +++ b/mfb/mfbclip.c @@ -50,6 +50,8 @@ SOFTWARE. #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include "regionstr.h" #include "pixmapstr.h" diff --git a/mfb/mfbfillarc.c b/mfb/mfbfillarc.c index a5442896f..8856eb0ae 100644 --- a/mfb/mfbfillarc.c +++ b/mfb/mfbfillarc.c @@ -31,6 +31,8 @@ in this Software without prior written authorization from The Open Group. #include <dix-config.h> #endif +#include <sys/limits.h> + #include <X11/X.h> #include <X11/Xprotostr.h> #include "regionstr.h" @@ -317,7 +319,7 @@ mfbPolyFillArcSolid(pDraw, pGC, narcs, parcs) box.x2 = x2; y2 = box.y1 + (int)arc->height + 1; box.y2 = y2; - if ( (x2 <= MAXSHORT) && (y2 <= MAXSHORT) && + if ( (x2 <= SHRT_MAX) && (y2 <= SHRT_MAX) && (RECT_IN_REGION(pDraw->pScreen, cclip, &box) == rgnIN) ) { if ((arc->angle2 >= FULLCIRCLE) || diff --git a/mfb/mfbgc.c b/mfb/mfbgc.c index c9ff20a45..b248a1caf 100644 --- a/mfb/mfbgc.c +++ b/mfb/mfbgc.c @@ -50,6 +50,8 @@ SOFTWARE. #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/mfb/mfbimage.c b/mfb/mfbimage.c index 299905701..e2d2438c5 100644 --- a/mfb/mfbimage.c +++ b/mfb/mfbimage.c @@ -51,6 +51,8 @@ SOFTWARE. #include <dix-config.h> #endif +#include <string.h> + #include <X11/X.h> #include "windowstr.h" diff --git a/mfb/mfbline.c b/mfb/mfbline.c index af7c27874..465dfd36e 100644 --- a/mfb/mfbline.c +++ b/mfb/mfbline.c @@ -50,6 +50,8 @@ SOFTWARE. #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include "gcstruct.h" diff --git a/mfb/mfbpixmap.c b/mfb/mfbpixmap.c index ad0dfe79f..29dcf3d33 100644 --- a/mfb/mfbpixmap.c +++ b/mfb/mfbpixmap.c @@ -56,6 +56,8 @@ SOFTWARE. #include <dix-config.h> #endif +#include <string.h> + #include <X11/Xmd.h> #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/mfb/mfbply1rct.c b/mfb/mfbply1rct.c index 9b783f609..83e59cff6 100644 --- a/mfb/mfbply1rct.c +++ b/mfb/mfbply1rct.c @@ -32,6 +32,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 "gcstruct.h" diff --git a/mfb/mfbpushpxl.c b/mfb/mfbpushpxl.c index 1cbdf9a5b..49211e6b7 100644 --- a/mfb/mfbpushpxl.c +++ b/mfb/mfbpushpxl.c @@ -51,6 +51,8 @@ SOFTWARE. #include <dix-config.h> #endif +#include <string.h> + #include <X11/X.h> #include "gcstruct.h" #include "scrnintstr.h" diff --git a/mfb/mfbscrinit.c b/mfb/mfbscrinit.c index 9defac1df..db48c9c10 100644 --- a/mfb/mfbscrinit.c +++ b/mfb/mfbscrinit.c @@ -51,6 +51,8 @@ SOFTWARE. #include <dix-config.h> #endif +#include <string.h> + #include <X11/X.h> #include <X11/Xproto.h> /* for xColorItem */ #include <X11/Xmd.h> diff --git a/mfb/mfbwindow.c b/mfb/mfbwindow.c index 56f3f468a..ccc07df1d 100644 --- a/mfb/mfbwindow.c +++ b/mfb/mfbwindow.c @@ -52,6 +52,8 @@ SOFTWARE. #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" diff --git a/mfb/mfbzerarc.c b/mfb/mfbzerarc.c index 92fd81dfb..cc45ee2d4 100644 --- a/mfb/mfbzerarc.c +++ b/mfb/mfbzerarc.c @@ -37,6 +37,8 @@ in this Software without prior written authorization from The Open Group. #include <dix-config.h> #endif +#include <sys/limits.h> + #include <X11/X.h> #include <X11/Xprotostr.h> #include "regionstr.h" @@ -246,7 +248,7 @@ mfbZeroPolyArcSS(pDraw, pGC, narcs, parcs) box.x2 = x2; y2 = box.y1 + (int)arc->height + 1; box.y2 = y2; - if ( (x2 <= MAXSHORT) && (y2 <= MAXSHORT) && + if ( (x2 <= SHRT_MAX) && (y2 <= SHRT_MAX) && (RECT_IN_REGION(pDraw->pScreen, cclip, &box) == rgnIN) ) mfbZeroArcSS(pDraw, pGC, arc); else diff --git a/miext/cw/cw.c b/miext/cw/cw.c index 4ebf8ab8a..ebc9a6f96 100644 --- a/miext/cw/cw.c +++ b/miext/cw/cw.c @@ -25,6 +25,8 @@ #include <dix-config.h> #endif +#include <string.h> + #include "gcstruct.h" #include "windowstr.h" #include "cw.h" diff --git a/miext/cw/cw_ops.c b/miext/cw/cw_ops.c index 80168a336..6ba804bb3 100644 --- a/miext/cw/cw_ops.c +++ b/miext/cw/cw_ops.c @@ -25,6 +25,8 @@ #include <dix-config.h> #endif +#include <stdlib.h> + #include "gcstruct.h" #include "cw.h" diff --git a/miext/cw/cw_render.c b/miext/cw/cw_render.c index 82ca006d2..beb906081 100644 --- a/miext/cw/cw_render.c +++ b/miext/cw/cw_render.c @@ -25,6 +25,8 @@ #include <dix-config.h> #endif +#include <string.h> + #include "gcstruct.h" #include "windowstr.h" #include "cw.h" diff --git a/miext/damage/damage.c b/miext/damage/damage.c index a1ac01a50..f8e95bdda 100755 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -26,6 +26,8 @@ #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" diff --git a/miext/shadow/shadow.c b/miext/shadow/shadow.c index d3d9135a5..b4a739ba4 100644 --- a/miext/shadow/shadow.c +++ b/miext/shadow/shadow.c @@ -26,6 +26,8 @@ #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" diff --git a/miext/shadow/shpacked.c b/miext/shadow/shpacked.c index 8989760d7..1af55bbc4 100644 --- a/miext/shadow/shpacked.c +++ b/miext/shadow/shpacked.c @@ -26,6 +26,8 @@ #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" diff --git a/miext/shadow/shplanar.c b/miext/shadow/shplanar.c index 3a8f05a85..529f35c57 100644 --- a/miext/shadow/shplanar.c +++ b/miext/shadow/shplanar.c @@ -26,6 +26,8 @@ #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" diff --git a/miext/shadow/shplanar8.c b/miext/shadow/shplanar8.c index fc45a8086..8db584b43 100644 --- a/miext/shadow/shplanar8.c +++ b/miext/shadow/shplanar8.c @@ -26,6 +26,8 @@ #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" diff --git a/miext/shadow/shrotpack.h b/miext/shadow/shrotpack.h index 7ed94fc1f..7f3f24111 100644 --- a/miext/shadow/shrotpack.h +++ b/miext/shadow/shrotpack.h @@ -31,6 +31,8 @@ #include <dix-config.h> #endif +#include <stdlib.h> + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" diff --git a/randr/randr.c b/randr/randr.c index a0e49ab15..bcaa232c9 100644 --- a/randr/randr.c +++ b/randr/randr.c @@ -50,9 +50,6 @@ #include "picturestr.h" #endif #include <X11/Xfuncproto.h> -#ifdef EXTMODULE -#include "xf86_ansic.h" -#endif /* From render.h */ #ifndef SubPixelUnknown diff --git a/record/record.c b/record/record.c index 5809e0086..95b1bb831 100644 --- a/record/record.c +++ b/record/record.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/record/record.c,v 1.3 2005/04/20 12:25:47 daniels Exp $ */ +/* $XdotOrg: xserver/xorg/record/record.c,v 1.5 2005/07/03 07:02:08 daniels Exp $ */ /* $Xorg: record.c,v 1.4 2001/02/09 02:05:27 xorgcvs Exp $ */ /* @@ -46,12 +46,8 @@ and Jim Haggerty of Metheus. #include <X11/extensions/recordstr.h> #include "set.h" -#ifndef XFree86LOADER #include <stdio.h> #include <assert.h> -#else -#include "xf86_ansic.h" -#endif #ifdef PANORAMIX #include "globals.h" diff --git a/record/set.c b/record/set.c index 83fb0e7d7..8419e2900 100644 --- a/record/set.c +++ b/record/set.c @@ -55,12 +55,13 @@ from The Open Group. #include <dix-config.h> #endif +#include <string.h> + #ifndef TESTING #include "misc.h" #else #include <stdio.h> #include <stdlib.h> -#include <string.h> /* stuff that you normally get from the X Server's environment */ @@ -93,11 +94,6 @@ void *Xcalloc(size) #include "set.h" -#ifdef XFree86LOADER -#include "xf86_libc.h" -#include "xf86_ansic.h" -#endif - static int maxMemberInInterval(pIntervals, nIntervals) RecordSetInterval *pIntervals; diff --git a/render/render.c b/render/render.c index 0f4bca92f..6cd862162 100644 --- a/render/render.c +++ b/render/render.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/render/render.c,v 1.8 2005/07/01 10:05:43 lars Exp $ */ +/* $XdotOrg: xserver/xorg/render/render.c,v 1.12 2005/08/28 19:47:39 ajax Exp $ */ /* * $XFree86: xc/programs/Xserver/render/render.c,v 1.27tsi Exp $ * @@ -48,9 +48,6 @@ #include "glyphstr.h" #include <X11/Xfuncproto.h> #include "cursorstr.h" -#ifdef EXTMODULE -#include "xf86_ansic.h" -#endif static int ProcRenderQueryVersion (ClientPtr pClient); static int ProcRenderQueryPictFormats (ClientPtr pClient); |