diff options
162 files changed, 331 insertions, 159 deletions
@@ -12,6 +12,169 @@ * hw/kdrive/*: Start importing kdrive. + * hw/kdrive/Makefile.am: + * hw/kdrive/ati/Makefile.am: + * hw/kdrive/ati/ati.c: + * hw/kdrive/ati/ati.h: + * hw/kdrive/ati/ati_cursor.c: + * hw/kdrive/ati/ati_draw.c: + * hw/kdrive/ati/ati_dri.c: + * hw/kdrive/ati/ati_stub.c: + * hw/kdrive/ati/ati_video.c: + * hw/kdrive/ati/radeon_composite.c: + * hw/kdrive/chips/Makefile.am: + * hw/kdrive/chips/chips.c: + * hw/kdrive/chips/chipsdraw.c: + * hw/kdrive/chips/chipsstub.c: + * hw/kdrive/ephyr/Makefile.am: + * hw/kdrive/ephyr/ephyr.c: + * hw/kdrive/ephyr/ephyr.h: + * hw/kdrive/ephyr/ephyrinit.c: + * hw/kdrive/ephyr/os.c: + * hw/kdrive/epson/Makefile.am: + * hw/kdrive/epson/epson13806.c: + * hw/kdrive/epson/epson13806stub.c: + * hw/kdrive/fake/Makefile.am: + * hw/kdrive/fake/fake.c: + * hw/kdrive/fake/fakeinit.c: + * hw/kdrive/fake/kbd.c: + * hw/kdrive/fake/mouse.c: + * hw/kdrive/fake/os.c: + * hw/kdrive/fbdev/Makefile.am: + * hw/kdrive/fbdev/fbdev.c: + * hw/kdrive/fbdev/fbinit.c: + * hw/kdrive/i810/Makefile.am: + * hw/kdrive/i810/i810.c: + * hw/kdrive/i810/i810_cursor.c: + * hw/kdrive/i810/i810_video.c: + * hw/kdrive/i810/i810draw.c: + * hw/kdrive/i810/i810stub.c: + * hw/kdrive/igs/igs.c: + * hw/kdrive/igs/igscmap.c: + * hw/kdrive/igs/igscurs.c: + * hw/kdrive/igs/igsdraw.c: + * hw/kdrive/igs/igsreg.c: + * hw/kdrive/igs/igsstub.c: + * hw/kdrive/ipaq/ipaq.c: + * hw/kdrive/itsy/itsy.c: + * hw/kdrive/itsy/kbd.c: + * hw/kdrive/itsy/ts.c: + * hw/kdrive/linux/Makefile.am: + * hw/kdrive/linux/agp.c: + * hw/kdrive/linux/bus.c: + * hw/kdrive/linux/evdev.c: + * hw/kdrive/linux/keyboard.c: + * hw/kdrive/linux/linux.c: + * hw/kdrive/linux/mouse.c: + * hw/kdrive/linux/ms.c: + * hw/kdrive/linux/ps2.c: + * hw/kdrive/linux/ts.c: + * hw/kdrive/linux/tslib.c: + * hw/kdrive/mach64/Makefile.am: + * hw/kdrive/mach64/mach64.c: + * hw/kdrive/mach64/mach64curs.c: + * hw/kdrive/mach64/mach64draw.c: + * hw/kdrive/mach64/mach64stub.c: + * hw/kdrive/mach64/mach64video.c: + * hw/kdrive/mga/Makefile.am: + * hw/kdrive/mga/g400_composite.c: + * hw/kdrive/mga/mga.c: + * hw/kdrive/mga/mgadraw.c: + * hw/kdrive/mga/mgastub.c: + * hw/kdrive/neomagic/Makefile.am: + * hw/kdrive/neomagic/backend.c: + * hw/kdrive/neomagic/neo_draw.c: + * hw/kdrive/neomagic/neomagic.c: + * hw/kdrive/neomagic/neomagicstub.c: + * hw/kdrive/nvidia/Makefile.am: + * hw/kdrive/nvidia/nvidia.c: + * hw/kdrive/nvidia/nvidiacurs.c: + * hw/kdrive/nvidia/nvidiadraw.c: + * hw/kdrive/nvidia/nvidiastub.c: + * hw/kdrive/nvidia/nvidiavideo.c: + * hw/kdrive/pcmcia/pcmcia.c: + * hw/kdrive/pcmcia/pcmciacurs.c: + * hw/kdrive/pcmcia/pcmciarotate.c: + * hw/kdrive/pcmcia/pcmciashadow.c: + * hw/kdrive/pcmcia/pcmciastub.c: + * hw/kdrive/pm2/Makefile.am: + * hw/kdrive/pm2/pm2.c: + * hw/kdrive/pm2/pm2_draw.c: + * hw/kdrive/pm2/pm2stub.c: + * hw/kdrive/r128/Makefile.am: + * hw/kdrive/r128/r128.c: + * hw/kdrive/r128/r128draw.c: + * hw/kdrive/r128/r128stub.c: + * hw/kdrive/savage/s3.c: + * hw/kdrive/savage/s3clock.c: + * hw/kdrive/savage/s3cmap.c: + * hw/kdrive/savage/s3curs.c: + * hw/kdrive/savage/s3draw.c: + * hw/kdrive/savage/s3gc.c: + * hw/kdrive/savage/s3reg.c: + * hw/kdrive/savage/s3rtst.c: + * hw/kdrive/savage/s3stub.c: + * hw/kdrive/sdl/Makefile.am: + * hw/kdrive/sdl/sdl.c: + * hw/kdrive/sis300/Makefile.am: + * hw/kdrive/sis300/sis.c: + * hw/kdrive/sis300/sis.h: + * hw/kdrive/sis300/sis_draw.c: + * hw/kdrive/sis300/sis_stub.c: + * hw/kdrive/sis530/sis.c: + * hw/kdrive/sis530/sisclock.c: + * hw/kdrive/sis530/siscmap.c: + * hw/kdrive/sis530/siscurs.c: + * hw/kdrive/sis530/sisdraw.c: + * hw/kdrive/sis530/sisio.c: + * hw/kdrive/sis530/sisstub.c: + * hw/kdrive/smi/Makefile.am: + * hw/kdrive/smi/smi.c: + * hw/kdrive/smi/smidraw.c: + * hw/kdrive/smi/smistub.c: + * hw/kdrive/smi/smivideo.c: + * hw/kdrive/src/Makefile.am: + * hw/kdrive/src/kaa.c: + * hw/kdrive/src/kaapict.c: + * hw/kdrive/src/kasync.c: + * hw/kdrive/src/kcmap.c: + * hw/kdrive/src/kcolor.c: + * hw/kdrive/src/kcurscol.c: + * hw/kdrive/src/kdrive.c: + * hw/kdrive/src/kinfo.c: + * hw/kdrive/src/kinput.c: + * hw/kdrive/src/kkeymap.c: + * hw/kdrive/src/kloadmap.c: + * hw/kdrive/src/kmap.c: + * hw/kdrive/src/kmode.c: + * hw/kdrive/src/knoop.c: + * hw/kdrive/src/koffscreen.c: + * hw/kdrive/src/kshadow.c: + * hw/kdrive/src/ktest.c: + * hw/kdrive/src/kxv.c: + * hw/kdrive/src/vga.c: + * hw/kdrive/trident/trident.c: + * hw/kdrive/trident/tridentcurs.c: + * hw/kdrive/trident/tridentdraw.c: + * hw/kdrive/trident/tridentstub.c: + * hw/kdrive/trio/s3.c: + * hw/kdrive/trio/s3clock.c: + * hw/kdrive/trio/s3cmap.c: + * hw/kdrive/trio/s3curs.c: + * hw/kdrive/trio/s3stub.c: + * hw/kdrive/ts300/ts300.c: + * hw/kdrive/vesa/Makefile.am: + * hw/kdrive/vesa/vbe.c: + * hw/kdrive/vesa/vesa.c: + * hw/kdrive/vesa/vesainit.c: + * hw/kdrive/vesa/vga.c: + * hw/kdrive/vesa/vm86.c: + * hw/kdrive/via/Makefile.am: + * hw/kdrive/vxworks/vxkbd.c: + * hw/kdrive/vxworks/vxmouse.c: + * hw/kdrive/vxworks/vxworks.c: + Build fixes: XSERVER_LIBS -> KDRIVE_LIBS, config.h -> kdrive-config.h + 2005-12-26 Daniel Stone <daniel@freedesktop.org> * xkb/xkbInit.c: diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am index aed7543d5..d2907bb62 100644 --- a/hw/kdrive/Makefile.am +++ b/hw/kdrive/Makefile.am @@ -1,3 +1,7 @@ +# none of this works yet. fbdev, ephyr, and the hardware servers all rely +# on miext/shadow/ changes we haven't brought over yet, and sdl relies on +# some detection-fu that hasn't been ported. + if KDRIVEVESA VESA_SUBDIRS = vesa mach64 mga nvidia r128 smi chips pm2 via neomagic endif diff --git a/hw/kdrive/ati/Makefile.am b/hw/kdrive/ati/Makefile.am index 2a268122c..6420d93b5 100644 --- a/hw/kdrive/ati/Makefile.am +++ b/hw/kdrive/ati/Makefile.am @@ -27,7 +27,7 @@ INCLUDES = \ $(DRI_INCLUDES) \ $(FBDEV_INCLUDES) \ $(VESA_INCLUDES) \ - @XSERVER_CFLAGS@ + @KDRIVE_CFLAGS@ bin_PROGRAMS = Xati diff --git a/hw/kdrive/ati/ati.c b/hw/kdrive/ati/ati.c index 54624e751..4db069a8b 100644 --- a/hw/kdrive/ati/ati.c +++ b/hw/kdrive/ati/ati.c @@ -24,7 +24,7 @@ /* $Header$ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "ati.h" #include "ati_reg.h" diff --git a/hw/kdrive/ati/ati.h b/hw/kdrive/ati/ati.h index d5bedd9bb..3b5fee380 100644 --- a/hw/kdrive/ati/ati.h +++ b/hw/kdrive/ati/ati.h @@ -27,7 +27,7 @@ #define _ATI_H_ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #ifdef KDRIVEFBDEV diff --git a/hw/kdrive/ati/ati_cursor.c b/hw/kdrive/ati/ati_cursor.c index 9ea51c404..a14fc6c97 100644 --- a/hw/kdrive/ati/ati_cursor.c +++ b/hw/kdrive/ati/ati_cursor.c @@ -22,7 +22,7 @@ /* $RCSId$ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "ati.h" #include "ati_reg.h" diff --git a/hw/kdrive/ati/ati_draw.c b/hw/kdrive/ati/ati_draw.c index 40f281a87..28cc7b047 100644 --- a/hw/kdrive/ati/ati_draw.c +++ b/hw/kdrive/ati/ati_draw.c @@ -24,7 +24,7 @@ /* $Header$ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "ati.h" #include "ati_reg.h" diff --git a/hw/kdrive/ati/ati_dri.c b/hw/kdrive/ati/ati_dri.c index 4a6dcb4ab..f2830e13a 100644 --- a/hw/kdrive/ati/ati_dri.c +++ b/hw/kdrive/ati/ati_dri.c @@ -26,7 +26,7 @@ #include <sys/time.h> #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "ati.h" diff --git a/hw/kdrive/ati/ati_stub.c b/hw/kdrive/ati/ati_stub.c index 0162362bf..01ebc3139 100644 --- a/hw/kdrive/ati/ati_stub.c +++ b/hw/kdrive/ati/ati_stub.c @@ -24,7 +24,7 @@ /* $Header$ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "ati.h" #include "klinux.h" diff --git a/hw/kdrive/ati/ati_video.c b/hw/kdrive/ati/ati_video.c index 96c0b99d6..504bdfd4f 100644 --- a/hw/kdrive/ati/ati_video.c +++ b/hw/kdrive/ati/ati_video.c @@ -25,7 +25,7 @@ /* $RCSId$ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "ati.h" #include "ati_dma.h" diff --git a/hw/kdrive/ati/radeon_composite.c b/hw/kdrive/ati/radeon_composite.c index d9c018143..18ada4f61 100644 --- a/hw/kdrive/ati/radeon_composite.c +++ b/hw/kdrive/ati/radeon_composite.c @@ -24,7 +24,7 @@ /* $Header$ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "ati.h" #include "ati_reg.h" diff --git a/hw/kdrive/chips/Makefile.am b/hw/kdrive/chips/Makefile.am index 833c1f44a..0585c7b58 100644 --- a/hw/kdrive/chips/Makefile.am +++ b/hw/kdrive/chips/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = \ @KDRIVE_INCS@ \ -I$(top_srcdir)/hw/kdrive/vesa \ - @XSERVER_CFLAGS@ + @KDRIVE_CFLAGS@ bin_PROGRAMS = Xchips diff --git a/hw/kdrive/chips/chips.c b/hw/kdrive/chips/chips.c index 513168914..10bd24cf3 100644 --- a/hw/kdrive/chips/chips.c +++ b/hw/kdrive/chips/chips.c @@ -22,7 +22,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/trident/trident.c,v 1.18 2001/06/04 09:45:42 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "chips.h" #include "kaa.h" diff --git a/hw/kdrive/chips/chipsdraw.c b/hw/kdrive/chips/chipsdraw.c index 554a3f0c6..7b1b56053 100644 --- a/hw/kdrive/chips/chipsdraw.c +++ b/hw/kdrive/chips/chipsdraw.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.c,v 1.10 2001/06/03 18:48:19 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "chips.h" diff --git a/hw/kdrive/chips/chipsstub.c b/hw/kdrive/chips/chipsstub.c index 00a48a48f..3499a4874 100644 --- a/hw/kdrive/chips/chipsstub.c +++ b/hw/kdrive/chips/chipsstub.c @@ -25,7 +25,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/chips/chipsstub.c,v 1.1 2001/09/05 07:12:42 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "chips.h" diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am index 18b498006..3a878f8de 100644 --- a/hw/kdrive/ephyr/Makefile.am +++ b/hw/kdrive/ephyr/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = \ @KDRIVE_INCS@ \ - @XSERVER_CFLAGS@ + @KDRIVE_CFLAGS@ noinst_LIBRARIES = libxephyr.a libxephyr-hostx.a diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c index f414aa597..d6b3a158c 100644 --- a/hw/kdrive/ephyr/ephyr.c +++ b/hw/kdrive/ephyr/ephyr.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "ephyr.h" diff --git a/hw/kdrive/ephyr/ephyr.h b/hw/kdrive/ephyr/ephyr.h index 408110132..93c210795 100644 --- a/hw/kdrive/ephyr/ephyr.h +++ b/hw/kdrive/ephyr/ephyr.h @@ -38,6 +38,8 @@ #include "randrstr.h" #endif +#include "damage.h" + typedef struct _ephyrPriv { CARD8 *base; int bytes_per_line; diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c index a7ebc417f..28deee826 100644 --- a/hw/kdrive/ephyr/ephyrinit.c +++ b/hw/kdrive/ephyr/ephyrinit.c @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "ephyr.h" diff --git a/hw/kdrive/ephyr/os.c b/hw/kdrive/ephyr/os.c index 2ee556155..ead15868b 100644 --- a/hw/kdrive/ephyr/os.c +++ b/hw/kdrive/ephyr/os.c @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "ephyr.h" diff --git a/hw/kdrive/epson/Makefile.am b/hw/kdrive/epson/Makefile.am index a4ec2706a..a9b875045 100644 --- a/hw/kdrive/epson/Makefile.am +++ b/hw/kdrive/epson/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = \ @KDRIVE_INCS@ \ - @XSERVER_CFLAGS@ + @KDRIVE_CFLAGS@ bin_PROGRAMS = Xepson diff --git a/hw/kdrive/epson/epson13806.c b/hw/kdrive/epson/epson13806.c index 01ce6e76d..43a9b58da 100644 --- a/hw/kdrive/epson/epson13806.c +++ b/hw/kdrive/epson/epson13806.c @@ -31,7 +31,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include <sys/ioctl.h> diff --git a/hw/kdrive/epson/epson13806stub.c b/hw/kdrive/epson/epson13806stub.c index 35db3e44a..125d90289 100644 --- a/hw/kdrive/epson/epson13806stub.c +++ b/hw/kdrive/epson/epson13806stub.c @@ -29,7 +29,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include <epson13806.h> diff --git a/hw/kdrive/fake/Makefile.am b/hw/kdrive/fake/Makefile.am index 825f0a8c2..02b79a961 100644 --- a/hw/kdrive/fake/Makefile.am +++ b/hw/kdrive/fake/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = \ @KDRIVE_INCS@ \ - @XSERVER_CFLAGS@ + @KDRIVE_CFLAGS@ noinst_LIBRARIES = libfake.a diff --git a/hw/kdrive/fake/fake.c b/hw/kdrive/fake/fake.c index 25b0c8136..d56512b3f 100644 --- a/hw/kdrive/fake/fake.c +++ b/hw/kdrive/fake/fake.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "fake.h" diff --git a/hw/kdrive/fake/fakeinit.c b/hw/kdrive/fake/fakeinit.c index fc2496502..c5ee4bc3f 100644 --- a/hw/kdrive/fake/fakeinit.c +++ b/hw/kdrive/fake/fakeinit.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "fake.h" diff --git a/hw/kdrive/fake/kbd.c b/hw/kdrive/fake/kbd.c index e6595c510..9cf4de060 100644 --- a/hw/kdrive/fake/kbd.c +++ b/hw/kdrive/fake/kbd.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/fake/kbd.c,v 1.1 1999/11/19 13:53:53 hohndel Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "fake.h" #include "kkeymap.h" diff --git a/hw/kdrive/fake/mouse.c b/hw/kdrive/fake/mouse.c index 9c11133b5..714a45123 100644 --- a/hw/kdrive/fake/mouse.c +++ b/hw/kdrive/fake/mouse.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #define NEED_EVENTS #include <errno.h> diff --git a/hw/kdrive/fake/os.c b/hw/kdrive/fake/os.c index 16786835a..32cb139c0 100644 --- a/hw/kdrive/fake/os.c +++ b/hw/kdrive/fake/os.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "fake.h" diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am index 3a8131cfb..fce6df9f4 100644 --- a/hw/kdrive/fbdev/Makefile.am +++ b/hw/kdrive/fbdev/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = \ @KDRIVE_INCS@ \ - @XSERVER_CFLAGS@ + @KDRIVE_CFLAGS@ noinst_LIBRARIES = libfbdev.a diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c index d38701019..e8338136a 100644 --- a/hw/kdrive/fbdev/fbdev.c +++ b/hw/kdrive/fbdev/fbdev.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c,v 1.31 2002/10/14 18:01:40 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "fbdev.h" #include <sys/ioctl.h> diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c index a63ca838e..ba9d1c695 100644 --- a/hw/kdrive/fbdev/fbinit.c +++ b/hw/kdrive/fbdev/fbinit.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/fbinit.c,v 1.8 2001/05/29 17:47:55 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include <fbdev.h> diff --git a/hw/kdrive/i810/Makefile.am b/hw/kdrive/i810/Makefile.am index da6d0801b..fdf1a1964 100644 --- a/hw/kdrive/i810/Makefile.am +++ b/hw/kdrive/i810/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = \ @KDRIVE_INCS@ \ - @XSERVER_CFLAGS@ + @KDRIVE_CFLAGS@ bin_PROGRAMS = Xi810 diff --git a/hw/kdrive/i810/i810.c b/hw/kdrive/i810/i810.c index 0c233b95d..d2318d786 100644 --- a/hw/kdrive/i810/i810.c +++ b/hw/kdrive/i810/i810.c @@ -43,7 +43,7 @@ X Window System is a trademark of The Open Group */ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" #include "kxv.h" diff --git a/hw/kdrive/i810/i810_cursor.c b/hw/kdrive/i810/i810_cursor.c index 6e41f581b..cf4f717f2 100644 --- a/hw/kdrive/i810/i810_cursor.c +++ b/hw/kdrive/i810/i810_cursor.c @@ -72,7 +72,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" #include "kxv.h" diff --git a/hw/kdrive/i810/i810_video.c b/hw/kdrive/i810/i810_video.c index 520ba6b33..ac881d51d 100644 --- a/hw/kdrive/i810/i810_video.c +++ b/hw/kdrive/i810/i810_video.c @@ -69,7 +69,7 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" #include "kxv.h" diff --git a/hw/kdrive/i810/i810draw.c b/hw/kdrive/i810/i810draw.c index a71e7a432..b571efbe0 100644 --- a/hw/kdrive/i810/i810draw.c +++ b/hw/kdrive/i810/i810draw.c @@ -36,7 +36,7 @@ X Window System is a trademark of The Open Group */ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" #include "kaa.h" diff --git a/hw/kdrive/i810/i810stub.c b/hw/kdrive/i810/i810stub.c index c679e976c..c195947c9 100644 --- a/hw/kdrive/i810/i810stub.c +++ b/hw/kdrive/i810/i810stub.c @@ -37,7 +37,7 @@ X Window System is a trademark of The Open Group */ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" #include "kxv.h" diff --git a/hw/kdrive/igs/igs.c b/hw/kdrive/igs/igs.c index 1b0907d4f..a0b139a30 100644 --- a/hw/kdrive/igs/igs.c +++ b/hw/kdrive/igs/igs.c @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "igs.h" diff --git a/hw/kdrive/igs/igscmap.c b/hw/kdrive/igs/igscmap.c index e6dc04e7b..06ab7a490 100644 --- a/hw/kdrive/igs/igscmap.c +++ b/hw/kdrive/igs/igscmap.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "igs.h" diff --git a/hw/kdrive/igs/igscurs.c b/hw/kdrive/igs/igscurs.c index 6bdc61658..6d6267666 100644 --- a/hw/kdrive/igs/igscurs.c +++ b/hw/kdrive/igs/igscurs.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "igs.h" #include "cursorstr.h" diff --git a/hw/kdrive/igs/igsdraw.c b/hw/kdrive/igs/igsdraw.c index d92ea6653..46c98cfc7 100644 --- a/hw/kdrive/igs/igsdraw.c +++ b/hw/kdrive/igs/igsdraw.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "igs.h" #include "igsdraw.h" diff --git a/hw/kdrive/igs/igsreg.c b/hw/kdrive/igs/igsreg.c index d63fce035..831d985bd 100644 --- a/hw/kdrive/igs/igsreg.c +++ b/hw/kdrive/igs/igsreg.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "igsreg.h" #include <stdio.h> diff --git a/hw/kdrive/igs/igsstub.c b/hw/kdrive/igs/igsstub.c index 00dd450f8..b0ce151f0 100644 --- a/hw/kdrive/igs/igsstub.c +++ b/hw/kdrive/igs/igsstub.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "igs.h" diff --git a/hw/kdrive/ipaq/ipaq.c b/hw/kdrive/ipaq/ipaq.c index f94b32121..f1432a605 100644 --- a/hw/kdrive/ipaq/ipaq.c +++ b/hw/kdrive/ipaq/ipaq.c @@ -25,7 +25,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/ipaq/ipaq.c,v 1.2 2001/05/29 17:47:55 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "pcmcia.h" diff --git a/hw/kdrive/itsy/itsy.c b/hw/kdrive/itsy/itsy.c index 48b56b7ff..0524b98d1 100644 --- a/hw/kdrive/itsy/itsy.c +++ b/hw/kdrive/itsy/itsy.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/itsy/itsy.c,v 1.2 1999/12/30 03:03:09 robin Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "itsy.h" diff --git a/hw/kdrive/itsy/kbd.c b/hw/kdrive/itsy/kbd.c index eec6514e1..76062c5a8 100644 --- a/hw/kdrive/itsy/kbd.c +++ b/hw/kdrive/itsy/kbd.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/itsy/kbd.c,v 1.1 1999/11/19 13:53:53 hohndel Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "itsy.h" #include "kkeymap.h" diff --git a/hw/kdrive/itsy/ts.c b/hw/kdrive/itsy/ts.c index 10efe90c8..c773c0e4f 100644 --- a/hw/kdrive/itsy/ts.c +++ b/hw/kdrive/itsy/ts.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/itsy/ts.c,v 1.1 1999/11/19 13:53:54 hohndel Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #define NEED_EVENTS #include "itsy.h" diff --git a/hw/kdrive/linux/Makefile.am b/hw/kdrive/linux/Makefile.am index c12adc29d..cf3183b8f 100644 --- a/hw/kdrive/linux/Makefile.am +++ b/hw/kdrive/linux/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = \ @KDRIVE_INCS@ \ - @XSERVER_CFLAGS@ + @KDRIVE_CFLAGS@ noinst_LIBRARIES = liblinux.a diff --git a/hw/kdrive/linux/agp.c b/hw/kdrive/linux/agp.c index d401e03a1..a874c7d4b 100644 --- a/hw/kdrive/linux/agp.c +++ b/hw/kdrive/linux/agp.c @@ -42,7 +42,7 @@ of the copyright holder. */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include <X11/X.h> diff --git a/hw/kdrive/linux/bus.c b/hw/kdrive/linux/bus.c index 15d2ba846..be61f891a 100644 --- a/hw/kdrive/linux/bus.c +++ b/hw/kdrive/linux/bus.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #define NEED_EVENTS #include <X11/X.h> diff --git a/hw/kdrive/linux/evdev.c b/hw/kdrive/linux/evdev.c index 91770316c..d83b13a6e 100644 --- a/hw/kdrive/linux/evdev.c +++ b/hw/kdrive/linux/evdev.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #define NEED_EVENTS #include <errno.h> diff --git a/hw/kdrive/linux/keyboard.c b/hw/kdrive/linux/keyboard.c index 97b0683de..cfafbb38f 100644 --- a/hw/kdrive/linux/keyboard.c +++ b/hw/kdrive/linux/keyboard.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" #include "kkeymap.h" diff --git a/hw/kdrive/linux/linux.c b/hw/kdrive/linux/linux.c index 9c06c8008..be11ec539 100644 --- a/hw/kdrive/linux/linux.c +++ b/hw/kdrive/linux/linux.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" #include "klinux.h" diff --git a/hw/kdrive/linux/mouse.c b/hw/kdrive/linux/mouse.c index 4a0c09a3e..16c0e7ba3 100644 --- a/hw/kdrive/linux/mouse.c +++ b/hw/kdrive/linux/mouse.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #define NEED_EVENTS #include <errno.h> diff --git a/hw/kdrive/linux/ms.c b/hw/kdrive/linux/ms.c index b29f6527b..6c8e6dc38 100644 --- a/hw/kdrive/linux/ms.c +++ b/hw/kdrive/linux/ms.c @@ -23,7 +23,7 @@ THE SOFTWARE. /* $RCSId: xc/programs/Xserver/hw/kdrive/linux/ms.c,v 1.1 2001/08/09 20:45:15 dawes Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #define NEED_EVENTS #include <errno.h> diff --git a/hw/kdrive/linux/ps2.c b/hw/kdrive/linux/ps2.c index da3372011..29b6a46a2 100644 --- a/hw/kdrive/linux/ps2.c +++ b/hw/kdrive/linux/ps2.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #define NEED_EVENTS #include <X11/X.h> diff --git a/hw/kdrive/linux/ts.c b/hw/kdrive/linux/ts.c index 9051c0d61..70c736117 100644 --- a/hw/kdrive/linux/ts.c +++ b/hw/kdrive/linux/ts.c @@ -26,7 +26,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #define NEED_EVENTS #include <X11/X.h> diff --git a/hw/kdrive/linux/tslib.c b/hw/kdrive/linux/tslib.c index 1addffdb4..c4caff922 100644 --- a/hw/kdrive/linux/tslib.c +++ b/hw/kdrive/linux/tslib.c @@ -66,7 +66,7 @@ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #define NEED_EVENTS #include <X11/X.h> diff --git a/hw/kdrive/mach64/Makefile.am b/hw/kdrive/mach64/Makefile.am index 9a9b46469..193bc2544 100644 --- a/hw/kdrive/mach64/Makefile.am +++ b/hw/kdrive/mach64/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = \ @KDRIVE_INCS@ \ -I$(top_srcdir)/hw/kdrive/vesa \ - @XSERVER_CFLAGS@ + @KDRIVE_CFLAGS@ bin_PROGRAMS = Xmach64 diff --git a/hw/kdrive/mach64/mach64.c b/hw/kdrive/mach64/mach64.c index 948065d03..1d4186d34 100644 --- a/hw/kdrive/mach64/mach64.c +++ b/hw/kdrive/mach64/mach64.c @@ -22,7 +22,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64.c,v 1.10 2002/10/14 18:01:41 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "mach64.h" #include "kaa.h" diff --git a/hw/kdrive/mach64/mach64curs.c b/hw/kdrive/mach64/mach64curs.c index b5d7cd16c..9ac1efd53 100644 --- a/hw/kdrive/mach64/mach64curs.c +++ b/hw/kdrive/mach64/mach64curs.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentcurs.c,v 1.6 2000/09/03 05:11:20 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "trident.h" #include "cursorstr.h" diff --git a/hw/kdrive/mach64/mach64draw.c b/hw/kdrive/mach64/mach64draw.c index 080904efe..f91798436 100644 --- a/hw/kdrive/mach64/mach64draw.c +++ b/hw/kdrive/mach64/mach64draw.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64draw.c,v 1.6 2001/07/23 03:44:17 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "mach64.h" #include "mach64draw.h" diff --git a/hw/kdrive/mach64/mach64stub.c b/hw/kdrive/mach64/mach64stub.c index 15ad0ce06..60808c26d 100644 --- a/hw/kdrive/mach64/mach64stub.c +++ b/hw/kdrive/mach64/mach64stub.c @@ -25,7 +25,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64stub.c,v 1.2 2001/10/12 06:33:10 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "mach64.h" #include <klinux.h> diff --git a/hw/kdrive/mach64/mach64video.c b/hw/kdrive/mach64/mach64video.c index 28d48deec..7d42807da 100644 --- a/hw/kdrive/mach64/mach64video.c +++ b/hw/kdrive/mach64/mach64video.c @@ -21,7 +21,7 @@ */ /* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64video.c,v 1.9tsi Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "mach64.h" diff --git a/hw/kdrive/mga/Makefile.am b/hw/kdrive/mga/Makefile.am index 66b2636b1..d236064ba 100644 --- a/hw/kdrive/mga/Makefile.am +++ b/hw/kdrive/mga/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = \ @KDRIVE_INCS@ \ -I$(top_srcdir)/hw/kdrive/vesa \ - @XSERVER_CFLAGS@ + @KDRIVE_CFLAGS@ bin_PROGRAMS = Xmga diff --git a/hw/kdrive/mga/g400_composite.c b/hw/kdrive/mga/g400_composite.c index e0ecdcd73..671e517fb 100644 --- a/hw/kdrive/mga/g400_composite.c +++ b/hw/kdrive/mga/g400_composite.c @@ -24,7 +24,7 @@ /* $Header$ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "mga.h" diff --git a/hw/kdrive/mga/mga.c b/hw/kdrive/mga/mga.c index c3f9479a2..990d646ac 100644 --- a/hw/kdrive/mga/mga.c +++ b/hw/kdrive/mga/mga.c @@ -23,7 +23,7 @@ */ /* $Header$ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "mga.h" diff --git a/hw/kdrive/mga/mgadraw.c b/hw/kdrive/mga/mgadraw.c index c7b89da8b..f961fc38d 100644 --- a/hw/kdrive/mga/mgadraw.c +++ b/hw/kdrive/mga/mgadraw.c @@ -23,7 +23,7 @@ */ /* $Header$ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "mga.h" #include "g400_common.h" diff --git a/hw/kdrive/mga/mgastub.c b/hw/kdrive/mga/mgastub.c index 56b9d7149..ebb40fd19 100644 --- a/hw/kdrive/mga/mgastub.c +++ b/hw/kdrive/mga/mgastub.c @@ -23,7 +23,7 @@ */ /* $Header$ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "mga.h" diff --git a/hw/kdrive/neomagic/Makefile.am b/hw/kdrive/neomagic/Makefile.am index 58f80c230..21fc62a50 100644 --- a/hw/kdrive/neomagic/Makefile.am +++ b/hw/kdrive/neomagic/Makefile.am @@ -12,7 +12,7 @@ INCLUDES = \ @KDRIVE_INCS@ \ $(FBDEV_INCLUDES) \ $(VESA_INCLUDES) \ - @XSERVER_CFLAGS@ + @KDRIVE_CFLAGS@ bin_PROGRAMS = Xneomagic diff --git a/hw/kdrive/neomagic/backend.c b/hw/kdrive/neomagic/backend.c index 958b83781..12fbf030a 100644 --- a/hw/kdrive/neomagic/backend.c +++ b/hw/kdrive/neomagic/backend.c @@ -10,7 +10,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "backend.h" diff --git a/hw/kdrive/neomagic/neo_draw.c b/hw/kdrive/neomagic/neo_draw.c index be0d39a84..89452b3d8 100644 --- a/hw/kdrive/neomagic/neo_draw.c +++ b/hw/kdrive/neomagic/neo_draw.c @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "neomagic.h" diff --git a/hw/kdrive/neomagic/neomagic.c b/hw/kdrive/neomagic/neomagic.c index 0a87cfa07..ac0c7569a 100644 --- a/hw/kdrive/neomagic/neomagic.c +++ b/hw/kdrive/neomagic/neomagic.c @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "neomagic.h" #include <sys/io.h> diff --git a/hw/kdrive/neomagic/neomagicstub.c b/hw/kdrive/neomagic/neomagicstub.c index 9a283afed..308f4a2c1 100644 --- a/hw/kdrive/neomagic/neomagicstub.c +++ b/hw/kdrive/neomagic/neomagicstub.c @@ -22,7 +22,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "neomagic.h" diff --git a/hw/kdrive/nvidia/Makefile.am b/hw/kdrive/nvidia/Makefile.am index 4b85662ba..fda904bf2 100644 --- a/hw/kdrive/nvidia/Makefile.am +++ b/hw/kdrive/nvidia/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = \ @KDRIVE_INCS@ \ -I$(top_srcdir)/hw/kdrive/vesa \ - @XSERVER_CFLAGS@ + @KDRIVE_CFLAGS@ bin_PROGRAMS = Xnvidia diff --git a/hw/kdrive/nvidia/nvidia.c b/hw/kdrive/nvidia/nvidia.c index a6a1f8ebc..1703a30c4 100644 --- a/hw/kdrive/nvidia/nvidia.c +++ b/hw/kdrive/nvidia/nvidia.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "nvidia.h" #include "kaa.h" diff --git a/hw/kdrive/nvidia/nvidiacurs.c b/hw/kdrive/nvidia/nvidiacurs.c index b5d7cd16c..9ac1efd53 100644 --- a/hw/kdrive/nvidia/nvidiacurs.c +++ b/hw/kdrive/nvidia/nvidiacurs.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentcurs.c,v 1.6 2000/09/03 05:11:20 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "trident.h" #include "cursorstr.h" diff --git a/hw/kdrive/nvidia/nvidiadraw.c b/hw/kdrive/nvidia/nvidiadraw.c index 9fa9459b1..dda3ea37a 100644 --- a/hw/kdrive/nvidia/nvidiadraw.c +++ b/hw/kdrive/nvidia/nvidiadraw.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "nvidia.h" #include "nvidiadraw.h" diff --git a/hw/kdrive/nvidia/nvidiastub.c b/hw/kdrive/nvidia/nvidiastub.c index 57ba3bd9b..ea2dd0f38 100644 --- a/hw/kdrive/nvidia/nvidiastub.c +++ b/hw/kdrive/nvidia/nvidiastub.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "nvidia.h" diff --git a/hw/kdrive/nvidia/nvidiavideo.c b/hw/kdrive/nvidia/nvidiavideo.c index 04cc8044c..1dd5a1c5d 100644 --- a/hw/kdrive/nvidia/nvidiavideo.c +++ b/hw/kdrive/nvidia/nvidiavideo.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "nvidia.h" diff --git a/hw/kdrive/pcmcia/pcmcia.c b/hw/kdrive/pcmcia/pcmcia.c index 087b0a604..dfdd2f6a9 100644 --- a/hw/kdrive/pcmcia/pcmcia.c +++ b/hw/kdrive/pcmcia/pcmcia.c @@ -30,7 +30,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/pcmcia/pcmcia.c,v 1.6 2002/10/14 18:01:41 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "pcmcia.h" #define extern diff --git a/hw/kdrive/pcmcia/pcmciacurs.c b/hw/kdrive/pcmcia/pcmciacurs.c index 1cb86cfe9..89770bc35 100644 --- a/hw/kdrive/pcmcia/pcmciacurs.c +++ b/hw/kdrive/pcmcia/pcmciacurs.c @@ -24,7 +24,7 @@ /* $RCSId: $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "pcmcia.h" #include "cursorstr.h" diff --git a/hw/kdrive/pcmcia/pcmciarotate.c b/hw/kdrive/pcmcia/pcmciarotate.c index 6ac7efbfd..ac3ec9dc2 100644 --- a/hw/kdrive/pcmcia/pcmciarotate.c +++ b/hw/kdrive/pcmcia/pcmciarotate.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include <X11/X.h> #include "scrnintstr.h" diff --git a/hw/kdrive/pcmcia/pcmciashadow.c b/hw/kdrive/pcmcia/pcmciashadow.c index abe73a0ba..c32333ff3 100644 --- a/hw/kdrive/pcmcia/pcmciashadow.c +++ b/hw/kdrive/pcmcia/pcmciashadow.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/pcmcia/pcmciashadow.c,v 1.1 2001/05/23 08:56:09 alanh Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include <X11/X.h> #include "scrnintstr.h" diff --git a/hw/kdrive/pcmcia/pcmciastub.c b/hw/kdrive/pcmcia/pcmciastub.c index b2145eab5..c509553ce 100644 --- a/hw/kdrive/pcmcia/pcmciastub.c +++ b/hw/kdrive/pcmcia/pcmciastub.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/pcmcia/pcmciastub.c,v 1.1 2001/05/23 08:56:09 alanh Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "pcmcia.h" diff --git a/hw/kdrive/pm2/Makefile.am b/hw/kdrive/pm2/Makefile.am index 4c1920467..aca476094 100644 --- a/hw/kdrive/pm2/Makefile.am +++ b/hw/kdrive/pm2/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = \ @KDRIVE_INCS@ \ -I$(top_srcdir)/hw/kdrive/vesa \ - @XSERVER_CFLAGS@ + @KDRIVE_CFLAGS@ bin_PROGRAMS = Xpm2 diff --git a/hw/kdrive/pm2/pm2.c b/hw/kdrive/pm2/pm2.c index df2cf7ce4..148f03abd 100644 --- a/hw/kdrive/pm2/pm2.c +++ b/hw/kdrive/pm2/pm2.c @@ -1,5 +1,5 @@ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" #include "kaa.h" diff --git a/hw/kdrive/pm2/pm2_draw.c b/hw/kdrive/pm2/pm2_draw.c index 1662adc96..332fc8c8a 100644 --- a/hw/kdrive/pm2/pm2_draw.c +++ b/hw/kdrive/pm2/pm2_draw.c @@ -1,5 +1,5 @@ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" #include "kaa.h" diff --git a/hw/kdrive/pm2/pm2stub.c b/hw/kdrive/pm2/pm2stub.c index 07a176005..fe469515b 100644 --- a/hw/kdrive/pm2/pm2stub.c +++ b/hw/kdrive/pm2/pm2stub.c @@ -1,5 +1,5 @@ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" #include "klinux.h" diff --git a/hw/kdrive/r128/Makefile.am b/hw/kdrive/r128/Makefile.am index d115fb053..aa3ca9bcd 100644 --- a/hw/kdrive/r128/Makefile.am +++ b/hw/kdrive/r128/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = \ @KDRIVE_INCS@ \ -I$(top_srcdir)/hw/kdrive/vesa \ - @XSERVER_CFLAGS@ + @KDRIVE_CFLAGS@ bin_PROGRAMS = Xr128 diff --git a/hw/kdrive/r128/r128.c b/hw/kdrive/r128/r128.c index 62d96fab0..6758d64ab 100644 --- a/hw/kdrive/r128/r128.c +++ b/hw/kdrive/r128/r128.c @@ -23,7 +23,7 @@ */ /* $Header$ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "r128.h" diff --git a/hw/kdrive/r128/r128draw.c b/hw/kdrive/r128/r128draw.c index 208d7ef5f..bdc55bba3 100644 --- a/hw/kdrive/r128/r128draw.c +++ b/hw/kdrive/r128/r128draw.c @@ -23,7 +23,7 @@ */ /* $Header$ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "r128.h" #include "kaa.h" diff --git a/hw/kdrive/r128/r128stub.c b/hw/kdrive/r128/r128stub.c index 8608d3f10..221648d9c 100644 --- a/hw/kdrive/r128/r128stub.c +++ b/hw/kdrive/r128/r128stub.c @@ -23,7 +23,7 @@ */ /* $Header$ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "r128.h" #include "klinux.h" diff --git a/hw/kdrive/savage/s3.c b/hw/kdrive/savage/s3.c index 06f23abaf..95051f27b 100644 --- a/hw/kdrive/savage/s3.c +++ b/hw/kdrive/savage/s3.c @@ -25,7 +25,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3.c,v 1.4 2000/05/06 22:17:44 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "s3.h" diff --git a/hw/kdrive/savage/s3clock.c b/hw/kdrive/savage/s3clock.c index e3286b8c2..40b6ed695 100644 --- a/hw/kdrive/savage/s3clock.c +++ b/hw/kdrive/savage/s3clock.c @@ -25,7 +25,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3clock.c,v 1.3 2000/02/23 20:30:02 dawes Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "s3.h" diff --git a/hw/kdrive/savage/s3cmap.c b/hw/kdrive/savage/s3cmap.c index f10ac5752..57f19f4df 100644 --- a/hw/kdrive/savage/s3cmap.c +++ b/hw/kdrive/savage/s3cmap.c @@ -25,7 +25,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3cmap.c,v 1.4 2000/05/06 22:17:45 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "s3.h" diff --git a/hw/kdrive/savage/s3curs.c b/hw/kdrive/savage/s3curs.c index eae7f642b..0440205eb 100644 --- a/hw/kdrive/savage/s3curs.c +++ b/hw/kdrive/savage/s3curs.c @@ -25,7 +25,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3curs.c,v 1.3 2000/02/23 20:30:03 dawes Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "s3.h" #include "s3draw.h" diff --git a/hw/kdrive/savage/s3draw.c b/hw/kdrive/savage/s3draw.c index cae765675..c22398fd2 100644 --- a/hw/kdrive/savage/s3draw.c +++ b/hw/kdrive/savage/s3draw.c @@ -25,7 +25,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3draw.c,v 1.6 2001/05/29 04:54:11 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "s3.h" #include "s3draw.h" diff --git a/hw/kdrive/savage/s3gc.c b/hw/kdrive/savage/s3gc.c index 6faadff27..789ab43d0 100644 --- a/hw/kdrive/savage/s3gc.c +++ b/hw/kdrive/savage/s3gc.c @@ -25,7 +25,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3gc.c,v 1.3 2000/01/21 01:12:02 dawes Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "s3.h" #include "s3draw.h" diff --git a/hw/kdrive/savage/s3reg.c b/hw/kdrive/savage/s3reg.c index 052bcf4d7..df2534bda 100644 --- a/hw/kdrive/savage/s3reg.c +++ b/hw/kdrive/savage/s3reg.c @@ -25,7 +25,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3reg.c,v 1.3 2000/02/23 20:30:04 dawes Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "s3reg.h" diff --git a/hw/kdrive/savage/s3rtst.c b/hw/kdrive/savage/s3rtst.c index c88e34585..6bcd2a4ce 100644 --- a/hw/kdrive/savage/s3rtst.c +++ b/hw/kdrive/savage/s3rtst.c @@ -25,7 +25,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3rtst.c,v 1.1 1999/11/19 13:53:57 hohndel Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include <stdio.h> #include "s3reg.h" diff --git a/hw/kdrive/savage/s3stub.c b/hw/kdrive/savage/s3stub.c index a678d9ec5..41553e6e3 100644 --- a/hw/kdrive/savage/s3stub.c +++ b/hw/kdrive/savage/s3stub.c @@ -25,7 +25,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3stub.c,v 1.3 2000/02/23 20:30:05 dawes Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "s3.h" diff --git a/hw/kdrive/sdl/Makefile.am b/hw/kdrive/sdl/Makefile.am index c8252d7c2..076f11f0c 100644 --- a/hw/kdrive/sdl/Makefile.am +++ b/hw/kdrive/sdl/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = \ @KDRIVE_PURE_INCS@ \ - @XSERVER_CFLAGS@ \ + @KDRIVE_CFLAGS@ \ @XSDL_INCS@ bin_PROGRAMS = Xsdl diff --git a/hw/kdrive/sdl/sdl.c b/hw/kdrive/sdl/sdl.c index 327359199..d354f6fb8 100644 --- a/hw/kdrive/sdl/sdl.c +++ b/hw/kdrive/sdl/sdl.c @@ -27,7 +27,7 @@ */ /* $Header$ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "kdrive-config.h" #endif #include "kdrive.h" #include "kkeymap.h" diff --git a/hw/kdrive/sis300/Makefile.am b/hw/kdrive/sis300/Makefile.am index b8d1b9ea6..7b21757e5 100644 --- a/hw/kdrive/sis300/Makefile.am +++ b/hw/kdrive/sis300/Makefile.am @@ -13,7 +13,7 @@ INCLUDES = \ $(DRI_INCLUDES) \ $(FBDEV_INCLUDES) \ $(VESA_INCLUDES) \ - @XSERVER_CFLAGS@ + @KDRIVE_CFLAGS@ bin_PROGRAMS = Xsis diff --git a/hw/kdrive/sis300/sis.c b/hw/kdrive/sis300/sis.c index 3dd04d83b..61fa997ee 100644 --- a/hw/kdrive/sis300/sis.c +++ b/hw/kdrive/sis300/sis.c @@ -24,7 +24,7 @@ /* $Header$ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "sis.h" #include "sis_reg.h" diff --git a/hw/kdrive/sis300/sis.h b/hw/kdrive/sis300/sis.h index 9e585bbf7..21cbdfc55 100644 --- a/hw/kdrive/sis300/sis.h +++ b/hw/kdrive/sis300/sis.h @@ -26,7 +26,7 @@ #ifndef _SIS_H_ #define _SIS_H_ -#include "config.h" +#include "kdrive-config.h" #ifdef KDRIVEFBDEV #include <fbdev.h> diff --git a/hw/kdrive/sis300/sis_draw.c b/hw/kdrive/sis300/sis_draw.c index ccdf7434b..77e5829e4 100644 --- a/hw/kdrive/sis300/sis_draw.c +++ b/hw/kdrive/sis300/sis_draw.c @@ -26,7 +26,7 @@ #include <sys/io.h> #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "sis.h" diff --git a/hw/kdrive/sis300/sis_stub.c b/hw/kdrive/sis300/sis_stub.c index 58f6ac1b5..7f2e48251 100644 --- a/hw/kdrive/sis300/sis_stub.c +++ b/hw/kdrive/sis300/sis_stub.c @@ -24,7 +24,7 @@ /* $Header$ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "sis.h" #include "klinux.h" diff --git a/hw/kdrive/sis530/sis.c b/hw/kdrive/sis530/sis.c index b2a95326e..023711af3 100644 --- a/hw/kdrive/sis530/sis.c +++ b/hw/kdrive/sis530/sis.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sis.c,v 1.4 2000/05/06 22:17:49 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "sis.h" diff --git a/hw/kdrive/sis530/sisclock.c b/hw/kdrive/sis530/sisclock.c index 4db2a31b9..06379e55a 100644 --- a/hw/kdrive/sis530/sisclock.c +++ b/hw/kdrive/sis530/sisclock.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisclock.c,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "sis.h" #include <stdio.h> diff --git a/hw/kdrive/sis530/siscmap.c b/hw/kdrive/sis530/siscmap.c index e52841e9d..42a008198 100644 --- a/hw/kdrive/sis530/siscmap.c +++ b/hw/kdrive/sis530/siscmap.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/siscmap.c,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "sis.h" diff --git a/hw/kdrive/sis530/siscurs.c b/hw/kdrive/sis530/siscurs.c index b507188c0..94dfffe7c 100644 --- a/hw/kdrive/sis530/siscurs.c +++ b/hw/kdrive/sis530/siscurs.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/siscurs.c,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "sis.h" #include "cursorstr.h" diff --git a/hw/kdrive/sis530/sisdraw.c b/hw/kdrive/sis530/sisdraw.c index 82618acab..5c7867b25 100644 --- a/hw/kdrive/sis530/sisdraw.c +++ b/hw/kdrive/sis530/sisdraw.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisdraw.c,v 1.5 2000/08/09 17:52:44 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "sis.h" #include "sisdraw.h" diff --git a/hw/kdrive/sis530/sisio.c b/hw/kdrive/sis530/sisio.c index 1a636a2f9..7b4765f31 100644 --- a/hw/kdrive/sis530/sisio.c +++ b/hw/kdrive/sis530/sisio.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisio.c,v 1.1 1999/11/19 13:54:00 hohndel Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #ifdef linux #define extern diff --git a/hw/kdrive/sis530/sisstub.c b/hw/kdrive/sis530/sisstub.c index 8d0f8d002..a377dd518 100644 --- a/hw/kdrive/sis530/sisstub.c +++ b/hw/kdrive/sis530/sisstub.c @@ -25,7 +25,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisstub.c,v 1.4 2000/08/09 17:52:44 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "sis.h" diff --git a/hw/kdrive/smi/Makefile.am b/hw/kdrive/smi/Makefile.am index d7e4d66ae..d0fe2de21 100644 --- a/hw/kdrive/smi/Makefile.am +++ b/hw/kdrive/smi/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = \ -I$(top_srcdir)/hw/kdrive/fbdev \ -I$(top_srcdir)/hw/kdrive/vesa \ @KDRIVE_INCS@ \ - @XSERVER_CFLAGS@ + @KDRIVE_CFLAGS@ bin_PROGRAMS = Xsmi diff --git a/hw/kdrive/smi/smi.c b/hw/kdrive/smi/smi.c index 6851b86e7..96c774aac 100644 --- a/hw/kdrive/smi/smi.c +++ b/hw/kdrive/smi/smi.c @@ -22,7 +22,7 @@ /* $XFree86: xc/programs/Xserver/hw/kdrive/smi/smi.c,v 1.11 2002/10/18 06:31:17 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "smi.h" #include "kaa.h" diff --git a/hw/kdrive/smi/smidraw.c b/hw/kdrive/smi/smidraw.c index 7f7ef4ca8..4e1a9fd45 100644 --- a/hw/kdrive/smi/smidraw.c +++ b/hw/kdrive/smi/smidraw.c @@ -24,7 +24,7 @@ /* $XFree86: xc/programs/Xserver/hw/kdrive/smi/smidraw.c,v 1.7 2001/07/24 19:06:03 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "smi.h" #include "smidraw.h" diff --git a/hw/kdrive/smi/smistub.c b/hw/kdrive/smi/smistub.c index 82286e1f6..5770e2a6f 100644 --- a/hw/kdrive/smi/smistub.c +++ b/hw/kdrive/smi/smistub.c @@ -25,7 +25,7 @@ /* $XFree86: xc/programs/Xserver/hw/kdrive/smi/smistub.c,v 1.4 2002/10/08 21:25:35 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "smi.h" #include "klinux.h" diff --git a/hw/kdrive/smi/smivideo.c b/hw/kdrive/smi/smivideo.c index 2395ebec7..32c73516a 100644 --- a/hw/kdrive/smi/smivideo.c +++ b/hw/kdrive/smi/smivideo.c @@ -21,7 +21,7 @@ */ /* $XFree86: xc/programs/Xserver/hw/kdrive/mach64/mach64video.c,v 1.10 2003/04/23 21:51:18 tsi Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "mach64.h" diff --git a/hw/kdrive/src/Makefile.am b/hw/kdrive/src/Makefile.am index 4758caea5..b71748b1a 100644 --- a/hw/kdrive/src/Makefile.am +++ b/hw/kdrive/src/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = \ @KDRIVE_INCS@ \ - @XSERVER_CFLAGS@ + @KDRIVE_CFLAGS@ noinst_LIBRARIES = libkdrive.a diff --git a/hw/kdrive/src/kaa.c b/hw/kdrive/src/kaa.c index 36406f270..178544ce0 100644 --- a/hw/kdrive/src/kaa.c +++ b/hw/kdrive/src/kaa.c @@ -25,7 +25,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" #include "kaa.h" diff --git a/hw/kdrive/src/kaapict.c b/hw/kdrive/src/kaapict.c index da093b224..6d44b726a 100644 --- a/hw/kdrive/src/kaapict.c +++ b/hw/kdrive/src/kaapict.c @@ -25,7 +25,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" #include "kaa.h" diff --git a/hw/kdrive/src/kasync.c b/hw/kdrive/src/kasync.c index 724d546dd..d57fab757 100644 --- a/hw/kdrive/src/kasync.c +++ b/hw/kdrive/src/kasync.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/kasync.c,v 1.8 2001/03/30 02:15:19 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" #include "kaa.h" diff --git a/hw/kdrive/src/kcmap.c b/hw/kdrive/src/kcmap.c index 855dc6f02..92ce5b920 100644 --- a/hw/kdrive/src/kcmap.c +++ b/hw/kdrive/src/kcmap.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/kcmap.c,v 1.4 2000/05/24 23:57:56 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" diff --git a/hw/kdrive/src/kcolor.c b/hw/kdrive/src/kcolor.c index bfff3a52c..c3669abdf 100644 --- a/hw/kdrive/src/kcolor.c +++ b/hw/kdrive/src/kcolor.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/kcolor.c,v 1.2 1999/12/30 03:03:05 robin Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" #include <stdio.h> diff --git a/hw/kdrive/src/kcurscol.c b/hw/kdrive/src/kcurscol.c index 50edf1735..943417e0d 100644 --- a/hw/kdrive/src/kcurscol.c +++ b/hw/kdrive/src/kcurscol.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" #include "cursorstr.h" diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c index 57a5d7d03..cc939d43f 100644 --- a/hw/kdrive/src/kdrive.c +++ b/hw/kdrive/src/kdrive.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" #ifdef PSEUDO8 diff --git a/hw/kdrive/src/kinfo.c b/hw/kdrive/src/kinfo.c index 883f7e56c..3ba7687c2 100644 --- a/hw/kdrive/src/kinfo.c +++ b/hw/kdrive/src/kinfo.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/kinfo.c,v 1.2 2000/02/23 20:29:53 dawes Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index a34350a6a..f21aa2d70 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/kinput.c,v 1.30 2002/11/13 16:37:39 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" #include "inputstr.h" @@ -1126,7 +1126,10 @@ KdReceiveTimeout (KdMouseInfo *mi) CARD32 KdSpecialKeys = 0; +#if 0 +/* already defined in opaque.h */ extern char dispatchException; +#endif /* * kdCheckTermination diff --git a/hw/kdrive/src/kkeymap.c b/hw/kdrive/src/kkeymap.c index bfab84038..66383e7f3 100644 --- a/hw/kdrive/src/kkeymap.c +++ b/hw/kdrive/src/kkeymap.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/kkeymap.c,v 1.1 1999/11/19 13:53:49 hohndel Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" #include <X11/keysym.h> diff --git a/hw/kdrive/src/kloadmap.c b/hw/kdrive/src/kloadmap.c index 17ec880dd..bc003d485 100644 --- a/hw/kdrive/src/kloadmap.c +++ b/hw/kdrive/src/kloadmap.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/kloadmap.c,v 1.1 1999/11/19 13:53:50 hohndel Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" #include "kkeymap.h" diff --git a/hw/kdrive/src/kmap.c b/hw/kdrive/src/kmap.c index bd506996b..73ff427c5 100644 --- a/hw/kdrive/src/kmap.c +++ b/hw/kdrive/src/kmap.c @@ -23,7 +23,7 @@ */ /* $RCSId: xc/programs/Xserver/hw/kdrive/kmap.c,v 1.10 2001/07/24 21:26:17 keithp Exp $ */ -#include <config.h> +#include <kdrive-config.h> #include "kdrive.h" #include <errno.h> diff --git a/hw/kdrive/src/kmode.c b/hw/kdrive/src/kmode.c index e79f5ff62..5a0c09095 100644 --- a/hw/kdrive/src/kmode.c +++ b/hw/kdrive/src/kmode.c @@ -24,7 +24,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" diff --git a/hw/kdrive/src/knoop.c b/hw/kdrive/src/knoop.c index f3eee0f36..b358bb374 100644 --- a/hw/kdrive/src/knoop.c +++ b/hw/kdrive/src/knoop.c @@ -28,7 +28,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" #include <gcstruct.h> diff --git a/hw/kdrive/src/koffscreen.c b/hw/kdrive/src/koffscreen.c index 4f69aacea..eeb35fa56 100644 --- a/hw/kdrive/src/koffscreen.c +++ b/hw/kdrive/src/koffscreen.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" #include "kaa.h" diff --git a/hw/kdrive/src/kshadow.c b/hw/kdrive/src/kshadow.c index 285adf1d2..36537ad40 100644 --- a/hw/kdrive/src/kshadow.c +++ b/hw/kdrive/src/kshadow.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" diff --git a/hw/kdrive/src/ktest.c b/hw/kdrive/src/ktest.c index 3fe3739a5..935c00e62 100644 --- a/hw/kdrive/src/ktest.c +++ b/hw/kdrive/src/ktest.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/ktest.c,v 1.1 1999/11/19 13:53:50 hohndel Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c index 57ca0db30..8580dc2ee 100644 --- a/hw/kdrive/src/kxv.c +++ b/hw/kdrive/src/kxv.c @@ -38,7 +38,7 @@ of the copyright holder. /* $RCSId: xc/programs/Xserver/hw/kdrive/kxv.c,v 1.3 2001/08/09 09:08:54 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" diff --git a/hw/kdrive/src/vga.c b/hw/kdrive/src/vga.c index 3e7a43ee9..9b8a7da39 100644 --- a/hw/kdrive/src/vga.c +++ b/hw/kdrive/src/vga.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/vga.c,v 1.2 1999/12/30 03:03:07 robin Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "vga.h" #include <stdio.h> diff --git a/hw/kdrive/trident/trident.c b/hw/kdrive/trident/trident.c index 9423f90e0..59f044896 100644 --- a/hw/kdrive/trident/trident.c +++ b/hw/kdrive/trident/trident.c @@ -22,7 +22,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/trident/trident.c,v 1.17 2001/06/03 18:48:19 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "trident.h" #include <sys/io.h> diff --git a/hw/kdrive/trident/tridentcurs.c b/hw/kdrive/trident/tridentcurs.c index 5f62294fb..521cf98d2 100644 --- a/hw/kdrive/trident/tridentcurs.c +++ b/hw/kdrive/trident/tridentcurs.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentcurs.c,v 1.5 2000/08/29 17:20:15 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "trident.h" #include "cursorstr.h" diff --git a/hw/kdrive/trident/tridentdraw.c b/hw/kdrive/trident/tridentdraw.c index 641d9239b..3ebba88d8 100644 --- a/hw/kdrive/trident/tridentdraw.c +++ b/hw/kdrive/trident/tridentdraw.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.c,v 1.10 2001/06/03 18:48:19 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "trident.h" #include "tridentdraw.h" diff --git a/hw/kdrive/trident/tridentstub.c b/hw/kdrive/trident/tridentstub.c index 0dd15f1b5..ebfd7ee9c 100644 --- a/hw/kdrive/trident/tridentstub.c +++ b/hw/kdrive/trident/tridentstub.c @@ -25,7 +25,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentstub.c,v 1.5 2000/11/29 08:42:25 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "trident.h" diff --git a/hw/kdrive/trio/s3.c b/hw/kdrive/trio/s3.c index c8359733b..6fb8c967f 100644 --- a/hw/kdrive/trio/s3.c +++ b/hw/kdrive/trio/s3.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3.c,v 1.4 2000/05/06 22:17:52 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "s3.h" diff --git a/hw/kdrive/trio/s3clock.c b/hw/kdrive/trio/s3clock.c index f79dfa92d..9fdd35e99 100644 --- a/hw/kdrive/trio/s3clock.c +++ b/hw/kdrive/trio/s3clock.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3clock.c,v 1.2 1999/12/30 03:03:19 robin Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "s3.h" diff --git a/hw/kdrive/trio/s3cmap.c b/hw/kdrive/trio/s3cmap.c index 19e192ed0..d59f29659 100644 --- a/hw/kdrive/trio/s3cmap.c +++ b/hw/kdrive/trio/s3cmap.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3cmap.c,v 1.1 1999/11/19 13:54:05 hohndel Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "s3.h" diff --git a/hw/kdrive/trio/s3curs.c b/hw/kdrive/trio/s3curs.c index 9416b4398..4d802c518 100644 --- a/hw/kdrive/trio/s3curs.c +++ b/hw/kdrive/trio/s3curs.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3curs.c,v 1.2 1999/12/30 03:03:19 robin Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "s3.h" #include "s3draw.h" diff --git a/hw/kdrive/trio/s3stub.c b/hw/kdrive/trio/s3stub.c index fe76d4066..68178eda0 100644 --- a/hw/kdrive/trio/s3stub.c +++ b/hw/kdrive/trio/s3stub.c @@ -25,7 +25,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3stub.c,v 1.3 2000/02/23 20:30:13 dawes Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "s3.h" diff --git a/hw/kdrive/ts300/ts300.c b/hw/kdrive/ts300/ts300.c index 00f80e87a..620ee7f40 100644 --- a/hw/kdrive/ts300/ts300.c +++ b/hw/kdrive/ts300/ts300.c @@ -24,7 +24,7 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/ts300/ts300.c,v 1.3 2000/02/23 20:30:14 dawes Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am index bdcb10c0e..33683fb94 100644 --- a/hw/kdrive/vesa/Makefile.am +++ b/hw/kdrive/vesa/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = \ @KDRIVE_INCS@ \ - @XSERVER_CFLAGS@ + @KDRIVE_CFLAGS@ noinst_LIBRARIES = libvesa.a diff --git a/hw/kdrive/vesa/vbe.c b/hw/kdrive/vesa/vbe.c index 7fc891a09..5fbd8abef 100644 --- a/hw/kdrive/vesa/vbe.c +++ b/hw/kdrive/vesa/vbe.c @@ -22,7 +22,7 @@ THE SOFTWARE. /* $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vbe.c,v 1.9 2001/05/29 04:54:12 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "vesa.h" diff --git a/hw/kdrive/vesa/vesa.c b/hw/kdrive/vesa/vesa.c index f09f4f3f9..67d2d438a 100644 --- a/hw/kdrive/vesa/vesa.c +++ b/hw/kdrive/vesa/vesa.c @@ -22,7 +22,7 @@ THE SOFTWARE. /* $Id$ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "vesa.h" #include "vga.h" diff --git a/hw/kdrive/vesa/vesainit.c b/hw/kdrive/vesa/vesainit.c index 0006e6c2e..933715731 100644 --- a/hw/kdrive/vesa/vesainit.c +++ b/hw/kdrive/vesa/vesainit.c @@ -22,7 +22,7 @@ THE SOFTWARE. /* $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vesainit.c,v 1.7 2001/09/05 07:12:43 keithp Exp $ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "vesa.h" diff --git a/hw/kdrive/vesa/vga.c b/hw/kdrive/vesa/vga.c index 500746774..3050eacce 100644 --- a/hw/kdrive/vesa/vga.c +++ b/hw/kdrive/vesa/vga.c @@ -23,7 +23,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "vesa.h" diff --git a/hw/kdrive/vesa/vm86.c b/hw/kdrive/vesa/vm86.c index 9d1fa8bcf..c4aadbd85 100644 --- a/hw/kdrive/vesa/vm86.c +++ b/hw/kdrive/vesa/vm86.c @@ -44,7 +44,7 @@ THE SOFTWARE. */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "vm86.h" diff --git a/hw/kdrive/via/Makefile.am b/hw/kdrive/via/Makefile.am index bcd0e8b86..9304c37e8 100644 --- a/hw/kdrive/via/Makefile.am +++ b/hw/kdrive/via/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = \ @KDRIVE_INCS@ \ -I$(top_srcdir)/hw/kdrive/vesa \ - @XSERVER_CFLAGS@ + @KDRIVE_CFLAGS@ bin_PROGRAMS = Xvia diff --git a/hw/kdrive/vxworks/vxkbd.c b/hw/kdrive/vxworks/vxkbd.c index 4bcca02b1..1c23aa915 100644 --- a/hw/kdrive/vxworks/vxkbd.c +++ b/hw/kdrive/vxworks/vxkbd.c @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" #include "kkeymap.h" diff --git a/hw/kdrive/vxworks/vxmouse.c b/hw/kdrive/vxworks/vxmouse.c index 75ed39bd0..97e24af4a 100644 --- a/hw/kdrive/vxworks/vxmouse.c +++ b/hw/kdrive/vxworks/vxmouse.c @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #define NEED_EVENTS #include <X11/X.h> diff --git a/hw/kdrive/vxworks/vxworks.c b/hw/kdrive/vxworks/vxworks.c index a40f7590f..ce214ff84 100644 --- a/hw/kdrive/vxworks/vxworks.c +++ b/hw/kdrive/vxworks/vxworks.c @@ -7,7 +7,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +#include <kdrive-config.h> #endif #include "kdrive.h" #include <X11/keysym.h> |