summaryrefslogtreecommitdiff
path: root/hw/kdrive/src
diff options
context:
space:
mode:
Diffstat (limited to 'hw/kdrive/src')
-rw-r--r--hw/kdrive/src/Makefile.am2
-rw-r--r--hw/kdrive/src/kaa.c2
-rw-r--r--hw/kdrive/src/kaapict.c2
-rw-r--r--hw/kdrive/src/kasync.c2
-rw-r--r--hw/kdrive/src/kcmap.c2
-rw-r--r--hw/kdrive/src/kcolor.c2
-rw-r--r--hw/kdrive/src/kcurscol.c2
-rw-r--r--hw/kdrive/src/kdrive.c2
-rw-r--r--hw/kdrive/src/kinfo.c2
-rw-r--r--hw/kdrive/src/kinput.c5
-rw-r--r--hw/kdrive/src/kkeymap.c2
-rw-r--r--hw/kdrive/src/kloadmap.c2
-rw-r--r--hw/kdrive/src/kmap.c2
-rw-r--r--hw/kdrive/src/kmode.c2
-rw-r--r--hw/kdrive/src/knoop.c2
-rw-r--r--hw/kdrive/src/koffscreen.c2
-rw-r--r--hw/kdrive/src/kshadow.c2
-rw-r--r--hw/kdrive/src/ktest.c2
-rw-r--r--hw/kdrive/src/kxv.c2
-rw-r--r--hw/kdrive/src/vga.c2
20 files changed, 23 insertions, 20 deletions
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>