diff options
52 files changed, 212 insertions, 6 deletions
diff --git a/hw/dmx/config/dmxcompat.c b/hw/dmx/config/dmxcompat.c index 3e6e6daeb..3681e8aa2 100644 --- a/hw/dmx/config/dmxcompat.c +++ b/hw/dmx/config/dmxcompat.c @@ -39,6 +39,10 @@ * This file is not used by the DMX server. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmxconfig.h" #include "dmxparse.h" #include "dmxcompat.h" diff --git a/hw/dmx/config/dmxconfig.c b/hw/dmx/config/dmxconfig.c index f276283a3..353ce11db 100644 --- a/hw/dmx/config/dmxconfig.c +++ b/hw/dmx/config/dmxconfig.c @@ -37,6 +37,10 @@ * combining that information with command-line configuration parameters. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmx.h" #include "dmxinput.h" #include "dmxconfig.h" diff --git a/hw/dmx/config/dmxparse.c b/hw/dmx/config/dmxparse.c index eed59cf57..1acb6d13e 100644 --- a/hw/dmx/config/dmxparse.c +++ b/hw/dmx/config/dmxparse.c @@ -41,6 +41,10 @@ * used in a stand-alone fashion (i.e., independent from the DMX server * source tree), no dependencies on other DMX routines are made. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/hw/dmx/config/dmxprint.c b/hw/dmx/config/dmxprint.c index a269fab0e..ed3fc213d 100644 --- a/hw/dmx/config/dmxprint.c +++ b/hw/dmx/config/dmxprint.c @@ -41,6 +41,10 @@ * used in a stand-alone fashion (i.e., independent from the DMX server * source tree), no dependencies on other DMX routines are made. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmxconfig.h" #include "dmxparse.h" #include "dmxprint.h" diff --git a/hw/dmx/config/parser.y b/hw/dmx/config/parser.y index 6adcc8ec9..ac2441017 100644 --- a/hw/dmx/config/parser.y +++ b/hw/dmx/config/parser.y @@ -33,6 +33,10 @@ */ %{ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmxparse.h" #include <string.h> #include <stdlib.h> diff --git a/hw/dmx/config/scanner.l b/hw/dmx/config/scanner.l index fe6d3a15f..ec450243a 100644 --- a/hw/dmx/config/scanner.l +++ b/hw/dmx/config/scanner.l @@ -33,6 +33,10 @@ */ %{ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmxparse.h" #include "parser.h" #include <string.h> diff --git a/hw/dmx/dmx_glxvisuals.c b/hw/dmx/dmx_glxvisuals.c index 806927612..1e0cbbc1b 100644 --- a/hw/dmx/dmx_glxvisuals.c +++ b/hw/dmx/dmx_glxvisuals.c @@ -33,6 +33,10 @@ ** */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmx.h" #include <GL/glx.h> #include <GL/glxproto.h> diff --git a/hw/dmx/dmxcb.c b/hw/dmx/dmxcb.c index fa79dd2db..b1f47bde4 100644 --- a/hw/dmx/dmxcb.c +++ b/hw/dmx/dmxcb.c @@ -35,6 +35,10 @@ /** \file * This code queries and modifies the connection block. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmx.h" #include "dmxcb.h" #include "dmxinput.h" diff --git a/hw/dmx/dmxclient.h b/hw/dmx/dmxclient.h index 4a0d689bd..586b82990 100644 --- a/hw/dmx/dmxclient.h +++ b/hw/dmx/dmxclient.h @@ -141,7 +141,9 @@ extern int ChangeDeviceNotify; #include <X11/XKBlib.h> #ifdef XKB #include <X11/extensions/XKBproto.h> +#ifndef XKB_IN_SERVER #define XKB_IN_SERVER +#endif #include <X11/extensions/XKBsrv.h> #undef XPointer #endif diff --git a/hw/dmx/dmxcmap.c b/hw/dmx/dmxcmap.c index 340f1791e..f46dc5411 100644 --- a/hw/dmx/dmxcmap.c +++ b/hw/dmx/dmxcmap.c @@ -35,6 +35,10 @@ /** \file * Colormap support. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmx.h" #include "dmxsync.h" #include "dmxcmap.h" diff --git a/hw/dmx/dmxcursor.c b/hw/dmx/dmxcursor.c index 77ec995b9..a49fc9f43 100644 --- a/hw/dmx/dmxcursor.c +++ b/hw/dmx/dmxcursor.c @@ -73,6 +73,10 @@ * maintainability for efficiency does not seem justified in this case. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #define DMX_CURSOR_DEBUG 0 #include "dmx.h" diff --git a/hw/dmx/dmxdpms.c b/hw/dmx/dmxdpms.c index 48f7488f1..5bcce188d 100644 --- a/hw/dmx/dmxdpms.c +++ b/hw/dmx/dmxdpms.c @@ -40,6 +40,10 @@ * (and restored at Xdmx server shutdown time). */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmx.h" #include "dmxdpms.h" #include "dmxlog.h" diff --git a/hw/dmx/dmxextension.c b/hw/dmx/dmxextension.c index 92de9815a..feadb5e31 100644 --- a/hw/dmx/dmxextension.c +++ b/hw/dmx/dmxextension.c @@ -38,6 +38,10 @@ * in programs/Xserver/Xext. Those programs should only include dmxext.h */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmx.h" #include "dmxinit.h" #include "dmxextension.h" @@ -57,8 +61,8 @@ #include "input/dmxinputinit.h" #include "windowstr.h" -#include "inputstr.h" /* For DeviceIntRec */ -#include "dmxproto.h" /* For DMX_BAD_* */ +#include "inputstr.h" /* For DeviceIntRec */ +#include <X11/extensions/dmxproto.h> /* For DMX_BAD_* */ #include "cursorstr.h" /* The default font is declared in dix/globals.c, but is not included in diff --git a/hw/dmx/dmxfont.c b/hw/dmx/dmxfont.c index 4ce736bf8..3dba61de4 100644 --- a/hw/dmx/dmxfont.c +++ b/hw/dmx/dmxfont.c @@ -35,6 +35,10 @@ /** \file * This file provides support for fonts. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #define DMX_FONTPATH_DEBUG 0 #include "dmx.h" diff --git a/hw/dmx/dmxgc.c b/hw/dmx/dmxgc.c index b9c97674b..d17b05164 100644 --- a/hw/dmx/dmxgc.c +++ b/hw/dmx/dmxgc.c @@ -35,6 +35,10 @@ /** \file * This file provides support for GCs. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmx.h" #include "dmxsync.h" #include "dmxgc.h" diff --git a/hw/dmx/dmxgcops.c b/hw/dmx/dmxgcops.c index fd0c70d4d..75d9dfb73 100644 --- a/hw/dmx/dmxgcops.c +++ b/hw/dmx/dmxgcops.c @@ -35,6 +35,10 @@ /** \file * This file provides support for GC operations. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmx.h" #include "dmxsync.h" #include "dmxgc.h" diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c index 438c4eb21..ddc4d2b04 100644 --- a/hw/dmx/dmxinit.c +++ b/hw/dmx/dmxinit.c @@ -38,6 +38,10 @@ * Provide expected functions for initialization from the ddx layer and * global variables for the DMX server. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmx.h" #include "dmxinit.h" #include "dmxsync.h" diff --git a/hw/dmx/dmxinput.c b/hw/dmx/dmxinput.c index b268319e4..7c376dee4 100644 --- a/hw/dmx/dmxinput.c +++ b/hw/dmx/dmxinput.c @@ -39,6 +39,10 @@ * that arequired by the dix layer. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmx.h" #include "dmxlog.h" #include "dmxinput.h" diff --git a/hw/dmx/dmxlog.c b/hw/dmx/dmxlog.c index 72aa0f87a..16d082daa 100644 --- a/hw/dmx/dmxlog.c +++ b/hw/dmx/dmxlog.c @@ -36,6 +36,10 @@ * This file encapsulated all of the logging functions that are used by * DMX for informational, warning, and error messages. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmx.h" #include "dmxlog.h" #include "dmxinput.h" diff --git a/hw/dmx/dmxpict.c b/hw/dmx/dmxpict.c index 7e831a5fe..fb19d864e 100644 --- a/hw/dmx/dmxpict.c +++ b/hw/dmx/dmxpict.c @@ -36,6 +36,10 @@ * Provide support for the RENDER extension (version 0.8). */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmx.h" #include "dmxsync.h" #include "dmxpict.h" diff --git a/hw/dmx/dmxpixmap.c b/hw/dmx/dmxpixmap.c index a51bf3327..e95ddd72e 100644 --- a/hw/dmx/dmxpixmap.c +++ b/hw/dmx/dmxpixmap.c @@ -35,6 +35,10 @@ /** \file * Provides pixmap support. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmx.h" #include "dmxsync.h" #include "dmxpixmap.h" diff --git a/hw/dmx/dmxprop.c b/hw/dmx/dmxprop.c index cac784121..8d9e22a27 100644 --- a/hw/dmx/dmxprop.c +++ b/hw/dmx/dmxprop.c @@ -56,6 +56,10 @@ * * The routines in this file handle the property management. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmx.h" #include "dmxprop.h" #include "dmxlog.h" diff --git a/hw/dmx/dmxscrinit.c b/hw/dmx/dmxscrinit.c index c3949dc18..5bfb4df0a 100644 --- a/hw/dmx/dmxscrinit.c +++ b/hw/dmx/dmxscrinit.c @@ -36,6 +36,10 @@ /** \file * This file provides support for screen initialization. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmx.h" #include "dmxsync.h" #include "dmxshadow.h" diff --git a/hw/dmx/dmxshadow.c b/hw/dmx/dmxshadow.c index f295da992..8d1e147d1 100644 --- a/hw/dmx/dmxshadow.c +++ b/hw/dmx/dmxshadow.c @@ -33,6 +33,10 @@ * */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmx.h" #include "dmxsync.h" #include "dmxshadow.h" diff --git a/hw/dmx/dmxstat.c b/hw/dmx/dmxstat.c index ae3f40458..3b092b2a8 100644 --- a/hw/dmx/dmxstat.c +++ b/hw/dmx/dmxstat.c @@ -43,6 +43,10 @@ * calls and monitoring their latency. This functionality can be turned * on using the -stat command-line parameter. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmx.h" #include "dmxstat.h" #include "dmxlog.h" diff --git a/hw/dmx/dmxsync.c b/hw/dmx/dmxsync.c index f304b5abc..02e244697 100644 --- a/hw/dmx/dmxsync.c +++ b/hw/dmx/dmxsync.c @@ -47,6 +47,10 @@ * times faster, with 68 more than 50X faster, 114 more than 10X faster, * and 181 more than 2X faster. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmx.h" #include "dmxsync.h" #include "dmxstat.h" diff --git a/hw/dmx/dmxvisual.c b/hw/dmx/dmxvisual.c index ff3fb8960..23ff0acfa 100644 --- a/hw/dmx/dmxvisual.c +++ b/hw/dmx/dmxvisual.c @@ -35,6 +35,10 @@ /** \file * This file provides support for visuals. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmx.h" #include "dmxvisual.h" diff --git a/hw/dmx/dmxwindow.c b/hw/dmx/dmxwindow.c index 2db72d795..25456e228 100644 --- a/hw/dmx/dmxwindow.c +++ b/hw/dmx/dmxwindow.c @@ -35,6 +35,10 @@ /** \file * This file provides support for window-related functions. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmx.h" #include "dmxsync.h" #include "dmxwindow.h" diff --git a/hw/dmx/input/ChkNotMaskEv.c b/hw/dmx/input/ChkNotMaskEv.c index 5471c7b3f..220e1de39 100644 --- a/hw/dmx/input/ChkNotMaskEv.c +++ b/hw/dmx/input/ChkNotMaskEv.c @@ -55,6 +55,10 @@ * This file provides a #XCheckNotMaskEvent function that is derived * from the standard Xlib XCheckMaskEvent function. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #define NEED_EVENTS #include "dmx.h" #include "ChkNotMaskEv.h" diff --git a/hw/dmx/input/dmxarg.c b/hw/dmx/input/dmxarg.c index 7882f9b6f..8708fa009 100644 --- a/hw/dmx/input/dmxarg.c +++ b/hw/dmx/input/dmxarg.c @@ -35,6 +35,10 @@ /** \file * Generic comma-delimited argument processing. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #define DMX_ARG_TEST 0 #include "dmx.h" diff --git a/hw/dmx/input/dmxbackend.c b/hw/dmx/input/dmxbackend.c index dd3d76e7d..8985a1b1d 100644 --- a/hw/dmx/input/dmxbackend.c +++ b/hw/dmx/input/dmxbackend.c @@ -37,6 +37,10 @@ * These routines support taking input from devices on the backend * (output) displays. \see dmxcommon.c. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #define DMX_BACKEND_DEBUG 0 #include "dmxinputinit.h" @@ -52,7 +56,7 @@ #include "inputstr.h" #include "input.h" -#include "keysym.h" +#include <X11/keysym.h> #include "mipointer.h" #include "scrnintstr.h" #include "windowstr.h" diff --git a/hw/dmx/input/dmxcommon.c b/hw/dmx/input/dmxcommon.c index 5a0da5f62..6a2b840e9 100644 --- a/hw/dmx/input/dmxcommon.c +++ b/hw/dmx/input/dmxcommon.c @@ -39,6 +39,10 @@ * input devices. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #define DMX_STATE_DEBUG 0 #include "dmxinputinit.h" @@ -50,7 +54,7 @@ #include "inputstr.h" #include "input.h" -#include "keysym.h" +#include <X11/keysym.h> #include "mipointer.h" #include "scrnintstr.h" diff --git a/hw/dmx/input/dmxconsole.c b/hw/dmx/input/dmxconsole.c index 03d3e2d9e..7a313aadd 100644 --- a/hw/dmx/input/dmxconsole.c +++ b/hw/dmx/input/dmxconsole.c @@ -39,6 +39,10 @@ * This file implements the console input devices. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #define DMX_CONSOLE_DEBUG 0 #define DMX_WINDOW_DEBUG 0 diff --git a/hw/dmx/input/dmxdetach.c b/hw/dmx/input/dmxdetach.c index a7a2ed058..d2e6b652f 100644 --- a/hw/dmx/input/dmxdetach.c +++ b/hw/dmx/input/dmxdetach.c @@ -35,6 +35,10 @@ /** \file * Provide support and helper functions for input detach and attach. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmxinputinit.h" #include "dmxextension.h" /* For dmxInputCount */ diff --git a/hw/dmx/input/dmxdummy.c b/hw/dmx/input/dmxdummy.c index d55aa5f9c..d6e614e51 100644 --- a/hw/dmx/input/dmxdummy.c +++ b/hw/dmx/input/dmxdummy.c @@ -37,6 +37,10 @@ * server, but that don't actually provide any events. This is useful * for testing. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmx.h" #include "dmxinputinit.h" #include "dmxdummy.h" diff --git a/hw/dmx/input/dmxeq.c b/hw/dmx/input/dmxeq.c index 15b25795c..7a6bb11fc 100644 --- a/hw/dmx/input/dmxeq.c +++ b/hw/dmx/input/dmxeq.c @@ -66,6 +66,10 @@ * Consortium). (Another example of similar code is provided in * hw/xfree86/common/xf86Xinput.c.) */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #define DMX_EQ_DEBUG 0 #include "dmx.h" diff --git a/hw/dmx/input/dmxevents.c b/hw/dmx/input/dmxevents.c index 596f37c84..5316f0fdc 100644 --- a/hw/dmx/input/dmxevents.c +++ b/hw/dmx/input/dmxevents.c @@ -36,6 +36,10 @@ * Provide support and helper functions for enqueing events received by * the low-level input drivers. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #define DMX_EVENTS_DEBUG 0 #include "dmxinputinit.h" @@ -48,7 +52,7 @@ #include "dmxsigio.h" #include "dmxmap.h" -#include "keysym.h" +#include <X11/keysym.h> #include "opaque.h" #include "inputstr.h" #include "mipointer.h" diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c index 0ac9e8025..5332dccd9 100644 --- a/hw/dmx/input/dmxinputinit.c +++ b/hw/dmx/input/dmxinputinit.c @@ -37,6 +37,10 @@ * input and lead to the calling of low-level device drivers for * input. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #define DMX_WINDOW_DEBUG 0 #include "dmxinputinit.h" diff --git a/hw/dmx/input/dmxmap.c b/hw/dmx/input/dmxmap.c index 02a41075c..cf1be5853 100644 --- a/hw/dmx/input/dmxmap.c +++ b/hw/dmx/input/dmxmap.c @@ -49,6 +49,10 @@ * XI_Device* names for these routines. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "dmxinputinit.h" #include "dmxmap.h" diff --git a/hw/dmx/input/dmxmotion.c b/hw/dmx/input/dmxmotion.c index 7148ddb3a..7b47c4562 100644 --- a/hw/dmx/input/dmxmotion.c +++ b/hw/dmx/input/dmxmotion.c @@ -39,6 +39,10 @@ * for motion buffers for extension devices, and are \a not compatible * replacements for the mi routines. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "inputstr.h" #include "dmxinputinit.h" #include "dmxcommon.h" diff --git a/hw/dmx/input/dmxsigio.c b/hw/dmx/input/dmxsigio.c index eb57c6e32..840b56641 100644 --- a/hw/dmx/input/dmxsigio.c +++ b/hw/dmx/input/dmxsigio.c @@ -36,6 +36,10 @@ * * Provides an interface for handling SIGIO signals for input devices. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "inputstr.h" #include "dmxinputinit.h" #include "dmxsigio.h" diff --git a/hw/dmx/input/dmxxinput.c b/hw/dmx/input/dmxxinput.c index 1d53e9f0f..bd4ace6d0 100644 --- a/hw/dmx/input/dmxxinput.c +++ b/hw/dmx/input/dmxxinput.c @@ -37,6 +37,10 @@ * This file implements support required by the XINPUT extension. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #define NEED_EVENTS #include <X11/X.h> #include <X11/Xproto.h> diff --git a/hw/dmx/input/lnx-keyboard.c b/hw/dmx/input/lnx-keyboard.c index c162aa952..97cc3077e 100644 --- a/hw/dmx/input/lnx-keyboard.c +++ b/hw/dmx/input/lnx-keyboard.c @@ -123,6 +123,10 @@ * Zborowski, and David Dawes (see the source code for complete * references). */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + /*****************************************************************************/ /* Define some macros to make it easier to move this file to another * part of the Xserver tree. All calls to the dmx* layer are #defined diff --git a/hw/dmx/input/lnx-ms.c b/hw/dmx/input/lnx-ms.c index c7218f6b7..6df4e80d3 100644 --- a/hw/dmx/input/lnx-ms.c +++ b/hw/dmx/input/lnx-ms.c @@ -69,6 +69,10 @@ * The code is derived from code by Juliusz Chroboczek and Keith Packard * (see the source code for complete references). */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "inputstr.h" #include <X11/Xos.h> #include <errno.h> diff --git a/hw/dmx/input/lnx-ps2.c b/hw/dmx/input/lnx-ps2.c index c83b1ecb7..0c5b870aa 100644 --- a/hw/dmx/input/lnx-ps2.c +++ b/hw/dmx/input/lnx-ps2.c @@ -66,6 +66,10 @@ * The code is derived from code by Keith Packard (see the source code * for complete references). */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "inputstr.h" #include <X11/Xos.h> #include <errno.h> diff --git a/hw/dmx/input/usb-common.c b/hw/dmx/input/usb-common.c index bf8939b70..a6fe7ad3b 100644 --- a/hw/dmx/input/usb-common.c +++ b/hw/dmx/input/usb-common.c @@ -37,6 +37,10 @@ * Routines that are common between #usb-keyboard.c, #usb-mouse.c, and * #usb-other.c */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "usb-private.h" #define USB_COMMON_DEBUG 1 diff --git a/hw/dmx/input/usb-keyboard.c b/hw/dmx/input/usb-keyboard.c index 518e18bb5..4b9439603 100644 --- a/hw/dmx/input/usb-keyboard.c +++ b/hw/dmx/input/usb-keyboard.c @@ -72,6 +72,10 @@ * under Linux. The keymap description is derived from code by Thomas * Roell, Orest Zborowski. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "atKeynames.h" #include "usb-private.h" diff --git a/hw/dmx/input/usb-mouse.c b/hw/dmx/input/usb-mouse.c index f6a7e9391..eb1a3d123 100644 --- a/hw/dmx/input/usb-mouse.c +++ b/hw/dmx/input/usb-mouse.c @@ -36,6 +36,10 @@ * * This code implements a low-level device driver for a USB mouse. */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "usb-private.h" /*****************************************************************************/ diff --git a/hw/dmx/input/usb-other.c b/hw/dmx/input/usb-other.c index 968c894f0..9ac9e16ca 100644 --- a/hw/dmx/input/usb-other.c +++ b/hw/dmx/input/usb-other.c @@ -37,6 +37,10 @@ * This code implements a low-level device driver for a non-keyboard, * non-mouse USB device (e.g., a joystick or gamepad). */ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "usb-private.h" /*****************************************************************************/ diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c index c8d877074..57f466444 100644 --- a/hw/vfb/InitInput.c +++ b/hw/vfb/InitInput.c @@ -28,6 +28,10 @@ from The Open Group. */ /* $XFree86: xc/programs/Xserver/hw/vfb/InitInput.c,v 3.9 2001/12/14 19:59:45 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #define NEED_EVENTS #include "mi.h" @@ -38,7 +42,7 @@ from The Open Group. #include "mibstore.h" #include "mipointer.h" #include "lk201kbd.h" -#include "keysym.h" +#include <X11/keysym.h> Bool LegalModifier(unsigned int key, DevicePtr pDev) diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c index f446fad38..23f16c362 100644 --- a/hw/vfb/InitOutput.c +++ b/hw/vfb/InitOutput.c @@ -28,6 +28,10 @@ from The Open Group. */ /* $XFree86: xc/programs/Xserver/hw/vfb/InitOutput.c,v 3.25 2003/11/15 04:01:56 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #if defined(WIN32) #include <X11/Xwinsock.h> #endif diff --git a/mi/miinitext.c b/mi/miinitext.c index 1cc464ac6..486bd7dce 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -52,6 +52,10 @@ SOFTWARE. #include <dix-config.h> #endif +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + #include "misc.h" #include "extension.h" #include "micmap.h" |