diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:02:09 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:02:09 +0000 |
| commit | e03198972ca78b03ad13cb49112c03a052bb763b (patch) | |
| tree | 1278f4b1a41b11511b0f5c2932191e44f0f9d8d3 /Xi | |
| parent | b8aef6c474ffc6d637bec178674898ea95ccde47 (diff) | |
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
source files in the xserver/xorg tree, predicated on defines of
HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
<X11/fonts/foo.h>.
Diffstat (limited to 'Xi')
74 files changed, 296 insertions, 0 deletions
diff --git a/Xi/allowev.c b/Xi/allowev.c index 3d0c6b7ed..c1df7eb73 100644 --- a/Xi/allowev.c +++ b/Xi/allowev.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/allowev.h b/Xi/allowev.h index 40c9a30c8..2d1132d3a 100644 --- a/Xi/allowev.h +++ b/Xi/allowev.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef ALLOWEV_H #define ALLOWEV_H 1 diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c index 6525546a1..63a3c9c69 100644 --- a/Xi/chgdctl.c +++ b/Xi/chgdctl.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/chgdctl.h b/Xi/chgdctl.h index a7e1c3b24..a6a530f37 100644 --- a/Xi/chgdctl.h +++ b/Xi/chgdctl.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef CHGDCTL_H #define CHGDCTL_H 1 diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c index a7228c02d..c502db325 100644 --- a/Xi/chgfctl.c +++ b/Xi/chgfctl.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/chgfctl.h b/Xi/chgfctl.h index cadf27fb4..94dab2814 100644 --- a/Xi/chgfctl.h +++ b/Xi/chgfctl.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef CHGFCTL_H #define CHGFCTL_H 1 diff --git a/Xi/chgkbd.c b/Xi/chgkbd.c index 1e6c78060..a8a6024d8 100644 --- a/Xi/chgkbd.c +++ b/Xi/chgkbd.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/chgkbd.h b/Xi/chgkbd.h index a878f1393..ddb17e3c4 100644 --- a/Xi/chgkbd.h +++ b/Xi/chgkbd.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef CHGKBD_H #define CHGKBD_H 1 diff --git a/Xi/chgkmap.c b/Xi/chgkmap.c index 82d4743e9..6b2a15aa2 100644 --- a/Xi/chgkmap.c +++ b/Xi/chgkmap.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/chgkmap.h b/Xi/chgkmap.h index 199285263..5e65a5b36 100644 --- a/Xi/chgkmap.h +++ b/Xi/chgkmap.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef CHGKMAP_H #define CHGKMAP_H 1 diff --git a/Xi/chgprop.c b/Xi/chgprop.c index 7f2f2cc00..20c654e2f 100644 --- a/Xi/chgprop.c +++ b/Xi/chgprop.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/chgprop.h b/Xi/chgprop.h index e9cb56a47..7395bc25c 100644 --- a/Xi/chgprop.h +++ b/Xi/chgprop.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef CHGPROP_H #define CHGPROP_H 1 diff --git a/Xi/chgptr.c b/Xi/chgptr.c index 3fca66019..bf2abd6b6 100644 --- a/Xi/chgptr.c +++ b/Xi/chgptr.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/chgptr.h b/Xi/chgptr.h index adf50b0bd..5b85da13f 100644 --- a/Xi/chgptr.h +++ b/Xi/chgptr.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef CHGPTR_H #define CHGPTR_H 1 diff --git a/Xi/closedev.c b/Xi/closedev.c index 49e292235..8a57aeeee 100644 --- a/Xi/closedev.c +++ b/Xi/closedev.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/closedev.h b/Xi/closedev.h index 882d81f14..e4869c96c 100644 --- a/Xi/closedev.h +++ b/Xi/closedev.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef CLOSEDEV_H #define CLOSEDEV_H 1 diff --git a/Xi/devbell.c b/Xi/devbell.c index 7c3b68eff..bdc941c1c 100644 --- a/Xi/devbell.c +++ b/Xi/devbell.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/devbell.h b/Xi/devbell.h index 8ceafa629..17cac6f7f 100644 --- a/Xi/devbell.h +++ b/Xi/devbell.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef DEVBELL_H #define DEVBELL_H 1 diff --git a/Xi/exevents.c b/Xi/exevents.c index 9c1ea01d9..99fbb129a 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -55,6 +55,10 @@ SOFTWARE. */ #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/extensions/XI.h> diff --git a/Xi/exglobals.h b/Xi/exglobals.h index 6f397a2d0..cba6310f4 100644 --- a/Xi/exglobals.h +++ b/Xi/exglobals.h @@ -29,6 +29,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * Globals referenced elsewhere in the server. * */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef EXGLOBALS_H #define EXGLOBALS_H 1 diff --git a/Xi/extinit.c b/Xi/extinit.c index ae110438a..0b27b5cf7 100644 --- a/Xi/extinit.c +++ b/Xi/extinit.c @@ -57,6 +57,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "inputstr.h" diff --git a/Xi/getbmap.c b/Xi/getbmap.c index cdfa05bb8..a944d4cc8 100644 --- a/Xi/getbmap.c +++ b/Xi/getbmap.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/getbmap.h b/Xi/getbmap.h index f1e300191..01cc3780a 100644 --- a/Xi/getbmap.h +++ b/Xi/getbmap.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef GETBMAP_H #define GETBMAP_H 1 diff --git a/Xi/getdctl.c b/Xi/getdctl.c index 3a903b72e..527273ac4 100644 --- a/Xi/getdctl.c +++ b/Xi/getdctl.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/getdctl.h b/Xi/getdctl.h index 5092bb4c6..168620eca 100644 --- a/Xi/getdctl.h +++ b/Xi/getdctl.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef GETDCTL_H #define GETDCTL_H 1 diff --git a/Xi/getfctl.c b/Xi/getfctl.c index 2f41bcf70..5652ad303 100644 --- a/Xi/getfctl.c +++ b/Xi/getfctl.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/getfctl.h b/Xi/getfctl.h index fe799244a..97805d9af 100644 --- a/Xi/getfctl.h +++ b/Xi/getfctl.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef GETFCTL_H #define GETFCTL_H 1 diff --git a/Xi/getfocus.c b/Xi/getfocus.c index d72cc7047..3c1597cc9 100644 --- a/Xi/getfocus.c +++ b/Xi/getfocus.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "windowstr.h" /* focus struct */ diff --git a/Xi/getfocus.h b/Xi/getfocus.h index 0ae139714..5d6438e1d 100644 --- a/Xi/getfocus.h +++ b/Xi/getfocus.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef GETFOCUS_H #define GETFOCUS_H 1 diff --git a/Xi/getkmap.c b/Xi/getkmap.c index 32436a439..4e67d9c71 100644 --- a/Xi/getkmap.c +++ b/Xi/getkmap.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/getkmap.h b/Xi/getkmap.h index b0dfb9f8e..5c2e3b189 100644 --- a/Xi/getkmap.h +++ b/Xi/getkmap.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef GETKMAP_H #define GETKMAP_H 1 diff --git a/Xi/getmmap.c b/Xi/getmmap.c index c44206899..6b2e38d0b 100644 --- a/Xi/getmmap.c +++ b/Xi/getmmap.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/getmmap.h b/Xi/getmmap.h index deeb28fdd..88e4af427 100644 --- a/Xi/getmmap.h +++ b/Xi/getmmap.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef GETMMAP_H #define GETMMAP_H 1 diff --git a/Xi/getprop.c b/Xi/getprop.c index 45b03f6a8..2b4de1f3e 100644 --- a/Xi/getprop.c +++ b/Xi/getprop.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/getprop.h b/Xi/getprop.h index b75dc515b..a8dcc3ab2 100644 --- a/Xi/getprop.h +++ b/Xi/getprop.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef GETPROP_H #define GETPROP_H 1 diff --git a/Xi/getselev.c b/Xi/getselev.c index b0408d8eb..c2ec2b9d5 100644 --- a/Xi/getselev.c +++ b/Xi/getselev.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include <X11/extensions/XI.h> diff --git a/Xi/getselev.h b/Xi/getselev.h index 0929de6fd..bb0e71a11 100644 --- a/Xi/getselev.h +++ b/Xi/getselev.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef GETSELEV_H #define GETSELEV_H 1 diff --git a/Xi/getvers.c b/Xi/getvers.c index 46c2c2567..1ad0ce785 100644 --- a/Xi/getvers.c +++ b/Xi/getvers.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/getvers.h b/Xi/getvers.h index c93359f99..93b7bfbec 100644 --- a/Xi/getvers.h +++ b/Xi/getvers.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef GETVERS_H #define GETVERS_H 1 diff --git a/Xi/grabdev.c b/Xi/grabdev.c index ea265ea81..3b124a0f4 100644 --- a/Xi/grabdev.c +++ b/Xi/grabdev.c @@ -56,6 +56,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/grabdev.h b/Xi/grabdev.h index 8a2e8fb39..d149da5d9 100644 --- a/Xi/grabdev.h +++ b/Xi/grabdev.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef GRABDEV_H #define GRABDEV_H 1 diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c index cc6ffc6c8..84f061086 100644 --- a/Xi/grabdevb.c +++ b/Xi/grabdevb.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/grabdevb.h b/Xi/grabdevb.h index c1a02de58..50929a32b 100644 --- a/Xi/grabdevb.h +++ b/Xi/grabdevb.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef GRABDEVB_H #define GRABDEVB_H 1 diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c index 14ecb61bb..17a9a9cf6 100644 --- a/Xi/grabdevk.c +++ b/Xi/grabdevk.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/grabdevk.h b/Xi/grabdevk.h index cf25e861f..230461937 100644 --- a/Xi/grabdevk.h +++ b/Xi/grabdevk.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef GRABDEVK_H #define GRABDEVK_H 1 diff --git a/Xi/gtmotion.c b/Xi/gtmotion.c index f02096586..02b1fee32 100644 --- a/Xi/gtmotion.c +++ b/Xi/gtmotion.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/gtmotion.h b/Xi/gtmotion.h index a4739db38..205b19958 100644 --- a/Xi/gtmotion.h +++ b/Xi/gtmotion.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef GTMOTION_H #define GTMOTION_H 1 diff --git a/Xi/listdev.c b/Xi/listdev.c index 6d00f46ef..b7eed86b7 100644 --- a/Xi/listdev.c +++ b/Xi/listdev.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/listdev.h b/Xi/listdev.h index 04518e528..125ea3580 100644 --- a/Xi/listdev.h +++ b/Xi/listdev.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef LISTDEV_H #define LISTDEV_H 1 diff --git a/Xi/opendev.c b/Xi/opendev.c index 4f9c2b63a..45bea7ae5 100644 --- a/Xi/opendev.c +++ b/Xi/opendev.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/opendev.h b/Xi/opendev.h index b5608792d..94ed6f6bd 100644 --- a/Xi/opendev.h +++ b/Xi/opendev.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef OPENDEV_H #define OPENDEV_H 1 diff --git a/Xi/queryst.c b/Xi/queryst.c index 4cc56dd4d..34b140c8e 100644 --- a/Xi/queryst.c +++ b/Xi/queryst.c @@ -36,6 +36,10 @@ from The Open Group. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/queryst.h b/Xi/queryst.h index 051192228..bf651b4bd 100644 --- a/Xi/queryst.h +++ b/Xi/queryst.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef QUERYST_H #define QUERYST_H 1 diff --git a/Xi/selectev.c b/Xi/selectev.c index bf92cfa58..c8a55f5b0 100644 --- a/Xi/selectev.c +++ b/Xi/selectev.c @@ -56,6 +56,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/selectev.h b/Xi/selectev.h index e2fa17623..82bdbc6c0 100644 --- a/Xi/selectev.h +++ b/Xi/selectev.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef SELECTEV_H #define SELECTEV_H 1 diff --git a/Xi/sendexev.c b/Xi/sendexev.c index 5f87298a2..c005aecab 100644 --- a/Xi/sendexev.c +++ b/Xi/sendexev.c @@ -56,6 +56,10 @@ SOFTWARE. #define EXTENSION_EVENT_BASE 64 #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/sendexev.h b/Xi/sendexev.h index 0f935addc..e5bc185a8 100644 --- a/Xi/sendexev.h +++ b/Xi/sendexev.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef SENDEXEV_H #define SENDEXEV_H 1 diff --git a/Xi/setbmap.c b/Xi/setbmap.c index 7282a02e2..37db5110d 100644 --- a/Xi/setbmap.c +++ b/Xi/setbmap.c @@ -58,6 +58,10 @@ SOFTWARE. #define IsOn(ptr, bit) \ (((BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7))) +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/setbmap.h b/Xi/setbmap.h index 36584767e..dab5fcbde 100644 --- a/Xi/setbmap.h +++ b/Xi/setbmap.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef SETBMAP_H #define SETBMAP_H 1 diff --git a/Xi/setdval.c b/Xi/setdval.c index 4bfc541c7..9b5b1e20d 100644 --- a/Xi/setdval.c +++ b/Xi/setdval.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/setdval.h b/Xi/setdval.h index 65ccb4504..d475c7cc6 100644 --- a/Xi/setdval.h +++ b/Xi/setdval.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef SETDVAL_H #define SETDVAL_H 1 diff --git a/Xi/setfocus.c b/Xi/setfocus.c index c68142e69..a1dd09d71 100644 --- a/Xi/setfocus.c +++ b/Xi/setfocus.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "windowstr.h" /* focus struct */ diff --git a/Xi/setfocus.h b/Xi/setfocus.h index db2dc1b61..62ff181d2 100644 --- a/Xi/setfocus.h +++ b/Xi/setfocus.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef SETFOCUS_H #define SETFOCUS_H 1 diff --git a/Xi/setmmap.c b/Xi/setmmap.c index 6ed18e01a..3fa2c7e7e 100644 --- a/Xi/setmmap.c +++ b/Xi/setmmap.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/setmmap.h b/Xi/setmmap.h index fd2710488..c859095f8 100644 --- a/Xi/setmmap.h +++ b/Xi/setmmap.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef SETMMAP_H #define SETMMAP_H 1 diff --git a/Xi/setmode.c b/Xi/setmode.c index 37bc2b357..f95ef5514 100644 --- a/Xi/setmode.c +++ b/Xi/setmode.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/setmode.h b/Xi/setmode.h index e05fb7633..d570af7bd 100644 --- a/Xi/setmode.h +++ b/Xi/setmode.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef SETMODE_H #define SETMODE_H 1 diff --git a/Xi/stubs.c b/Xi/stubs.c index 8f10bd02c..7ad6d903e 100644 --- a/Xi/stubs.c +++ b/Xi/stubs.c @@ -58,6 +58,10 @@ SOFTWARE. */ #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "inputstr.h" diff --git a/Xi/ungrdev.c b/Xi/ungrdev.c index 5f6ecf9e2..8de4cd225 100644 --- a/Xi/ungrdev.c +++ b/Xi/ungrdev.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/ungrdev.h b/Xi/ungrdev.h index 96d2662e1..e8e866bc9 100644 --- a/Xi/ungrdev.h +++ b/Xi/ungrdev.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef UNGRDEV_H #define UNGRDEV_H 1 diff --git a/Xi/ungrdevb.c b/Xi/ungrdevb.c index 2b2288f1e..8927a5c6e 100644 --- a/Xi/ungrdevb.c +++ b/Xi/ungrdevb.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/ungrdevb.h b/Xi/ungrdevb.h index 2f7899c31..238e56954 100644 --- a/Xi/ungrdevb.h +++ b/Xi/ungrdevb.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef UNGRDEVB_H #define UNGRDEVB_H 1 diff --git a/Xi/ungrdevk.c b/Xi/ungrdevk.c index 621ba4ddf..38cfa1b71 100644 --- a/Xi/ungrdevk.c +++ b/Xi/ungrdevk.c @@ -55,6 +55,10 @@ SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> /* for inputstr.h */ #include <X11/Xproto.h> /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ diff --git a/Xi/ungrdevk.h b/Xi/ungrdevk.h index 275ec446d..ba3455882 100644 --- a/Xi/ungrdevk.h +++ b/Xi/ungrdevk.h @@ -24,6 +24,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef UNGRDEVK_H #define UNGRDEVK_H 1 |