Remove libcwrapper usage from xorg server modules. The libcwrapper is only
of (marginal) use in the drivers, and that usage remains.
This commit is contained in:
Eric Anholt
parent
a8cec1b656
commit
c3d1403672
195
ChangeLog
195
ChangeLog
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -40,6 +40,8 @@
|
|||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include "glxserver.h"
|
||||
#include <GL/glxtokens.h>
|
||||
#include <unpack.h>
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -40,6 +40,8 @@
|
|||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include "glxserver.h"
|
||||
#include <GL/glxtokens.h>
|
||||
#include <unpack.h>
|
||||
|
|
|
|||
|
|
@ -23,6 +23,8 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <X11/Xmd.h>
|
||||
#include <GL/gl.h>
|
||||
#include <GL/glxproto.h>
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -56,9 +56,6 @@
|
|||
|
||||
#ifdef XFree86Server
|
||||
|
||||
#ifdef XFree86LOADER
|
||||
#include "xf86_ansic.h"
|
||||
#endif
|
||||
#ifndef assert
|
||||
#define assert(a)
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -50,8 +50,6 @@ SOFTWARE.
|
|||
# include "io.h"
|
||||
# define O_NDELAY 0L
|
||||
#endif
|
||||
#else
|
||||
#include "xf86_ansic.h"
|
||||
#endif
|
||||
|
||||
#define NEED_REPLIES
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -39,6 +39,8 @@ SOFTWARE.
|
|||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <X11/X.h>
|
||||
#define NEED_REPLIES
|
||||
#define NEED_EVENTS
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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)])
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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)(
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -53,6 +53,8 @@ SOFTWARE.
|
|||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <X11/X.h>
|
||||
#include <X11/Xprotostr.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -52,6 +52,8 @@ SOFTWARE.
|
|||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <X11/X.h>
|
||||
#include "regionstr.h"
|
||||
#include "pixmapstr.h"
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@
|
|||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <X11/X.h>
|
||||
#include "windowstr.h"
|
||||
#include "pixmapstr.h"
|
||||
|
|
|
|||
|
|
@ -58,6 +58,8 @@ SOFTWARE.
|
|||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <X11/Xmd.h>
|
||||
#include "scrnintstr.h"
|
||||
#include "pixmapstr.h"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -52,6 +52,8 @@ SOFTWARE.
|
|||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <X11/X.h>
|
||||
#include "gcstruct.h"
|
||||
#include "scrnintstr.h"
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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) ||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -51,6 +51,8 @@ SOFTWARE.
|
|||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <X11/X.h>
|
||||
#include "windowstr.h"
|
||||
#include "pixmapstr.h"
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@ SOFTWARE.
|
|||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <X11/X.h>
|
||||
|
||||
#include "gcstruct.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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -51,6 +51,8 @@ SOFTWARE.
|
|||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <X11/X.h>
|
||||
#include "scrnintstr.h"
|
||||
#include "windowstr.h"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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()] */
|
||||
|
|
|
|||
|
|
@ -58,11 +58,7 @@
|
|||
#include "gcstruct.h"
|
||||
#include "inputstr.h"
|
||||
|
||||
#ifndef IN_MODULE
|
||||
#include <stdio.h>
|
||||
#else
|
||||
#include "xf86_ansic.h"
|
||||
#endif
|
||||
|
||||
/* DEFINES */
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@
|
|||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include "fb.h"
|
||||
|
||||
#ifdef RENDER
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
#include <string.h>
|
||||
|
||||
#include <X11/X.h>
|
||||
#include <X11/Xproto.h>
|
||||
#include "scrnintstr.h"
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@
|
|||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "fb.h"
|
||||
#include "miline.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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 *);
|
||||
|
|
|
|||
|
|
@ -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 *);
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
|
||||
#include "misc.h"
|
||||
#include "xf86.h"
|
||||
#include "xf86_ansic.h"
|
||||
#include "xf86_OSproc.h"
|
||||
#include "xf86DDC.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@
|
|||
#endif
|
||||
|
||||
#ifdef XFree86LOADER
|
||||
#include "xf86_ansic.h"
|
||||
|
||||
#include "xf86Module.h"
|
||||
#include "xf86Opt.h"
|
||||
|
|
|
|||
|
|
@ -30,11 +30,7 @@
|
|||
#include "dgaproc.h"
|
||||
#include "xf86dgaext.h"
|
||||
|
||||
#ifdef EXTMODULE
|
||||
#include "xf86_ansic.h"
|
||||
#else
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
#include "modinit.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -41,10 +41,6 @@
|
|||
#endif /* USL */
|
||||
#endif
|
||||
|
||||
#ifdef EXTMODULE
|
||||
#include "xf86_ansic.h"
|
||||
#endif
|
||||
|
||||
static int miscErrorBase;
|
||||
static int MiscGeneration = 0;
|
||||
static int MiscClientPrivateIndex;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
#include "xf86_ansic.h"
|
||||
|
||||
/* pci stuff */
|
||||
#include "xf86PciInfo.h"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -2,6 +2,9 @@
|
|||
#include <xorg-config.h>
|
||||
#endif
|
||||
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "xf86.h"
|
||||
#include "xf86i2c.h"
|
||||
#include "msp3430.h"
|
||||
|
|
|
|||
|
|
@ -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));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
#endif
|
||||
|
||||
#include "xf86.h"
|
||||
#include "xf86_ansic.h"
|
||||
#include "compiler.h"
|
||||
#define _INT10_PRIVATE
|
||||
#include "xf86int10.h"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@
|
|||
|
||||
#ifdef XFree86LOADER
|
||||
#include "misc.h"
|
||||
#include "xf86_libc.h"
|
||||
#endif
|
||||
#include "xf86.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
#include <sys/linker.h>
|
||||
|
||||
#include "xf86_OSproc.h"
|
||||
#include "xf86_ansic.h"
|
||||
|
||||
/*
|
||||
* Load a FreeBSD kernel module.
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,6 @@
|
|||
# include "xf86drm.h"
|
||||
# ifdef XFree86LOADER
|
||||
# include "xf86.h"
|
||||
# include "xf86_ansic.h"
|
||||
# else
|
||||
# include <stdio.h>
|
||||
# include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
#include "xf86_ansic.h"
|
||||
#include "xf86Pci.h"
|
||||
#include "compiler.h"
|
||||
#define _INT10_PRIVATE
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
#include "xf86_ansic.h"
|
||||
#include "xf86Pci.h"
|
||||
#include "compiler.h"
|
||||
#define _INT10_PRIVATE
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user