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 | |
| 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>.
1248 files changed, 5220 insertions, 183 deletions
diff --git a/GL/apple/aglGlx.c b/GL/apple/aglGlx.c index fa7533e73..3906d775f 100644 --- a/GL/apple/aglGlx.c +++ b/GL/apple/aglGlx.c @@ -34,6 +34,10 @@ */ /* $XFree86: xc/programs/Xserver/GL/apple/aglGlx.c,v 1.2 2003/09/16 00:36:11 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "quartzCommon.h" #include <AGL/agl.h> #include "cr.h" diff --git a/GL/apple/indirect.c b/GL/apple/indirect.c index 32227617a..bbda59f8f 100644 --- a/GL/apple/indirect.c +++ b/GL/apple/indirect.c @@ -33,6 +33,10 @@ */ /* $XFree86: xc/programs/Xserver/GL/apple/indirect.c,v 1.2 2003/09/16 00:36:11 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "dri.h" #include "quartz.h" diff --git a/GL/glx/g_disptab.c b/GL/glx/g_disptab.c index 8c8dc2ccc..93a9d628d 100644 --- a/GL/glx/g_disptab.c +++ b/GL/glx/g_disptab.c @@ -29,6 +29,10 @@ ** version 1.2.1 Specification. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include "glxext.h" #include "g_disptab.h" diff --git a/GL/glx/g_disptab.h b/GL/glx/g_disptab.h index 566650bf7..0580b5529 100644 --- a/GL/glx/g_disptab.h +++ b/GL/glx/g_disptab.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.4 2003/09/28 20:15:42 alanh Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _GLX_g_disptab_h_ #define _GLX_g_disptab_h_ /* diff --git a/GL/glx/g_disptab_EXT.c b/GL/glx/g_disptab_EXT.c index c37a236db..1ce1bd4a7 100644 --- a/GL/glx/g_disptab_EXT.c +++ b/GL/glx/g_disptab_EXT.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.c,v 1.3 2001/03/21 16:29:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.c,v 1.5 2004/01/28 18:11:50 alanh Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ /* ** License Applicability. Except to the extent portions of this file are @@ -29,6 +29,10 @@ ** version 1.2.1 Specification. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include "glxext.h" #include "g_disptab_EXT.h" @@ -45,8 +49,13 @@ __GLXdispatchRenderProcPtr __glXRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT - __ __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, +#ifndef MISSING_GL_EXTS __glXDisp_PointParameterfARB, /* 2065 */ __glXDisp_PointParameterfvARB, /* 2066 */ +#else + __glXNoSuchRenderOpcode, + __glXNoSuchRenderOpcode, +#endif __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, @@ -2104,6 +2113,7 @@ __GLXdispatchRenderProcPtr __glXRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT - __ __glXDisp_CopyTexSubImage1D, /* 4121 */ __glXDisp_CopyTexSubImage2D, /* 4122 */ __glXDisp_CopyTexSubImage3D, /* 4123 */ +#ifndef MISSING_GL_EXTS __glXDisp_FogCoordfv, /* 4124 */ __glXDisp_FogCoorddv, /* 4125 */ __glXDisp_SecondaryColor3bv, /* 4126 */ @@ -2115,6 +2125,19 @@ __GLXdispatchRenderProcPtr __glXRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT - __ __glXDisp_SecondaryColor3usv, /* 4132 */ __glXDisp_SecondaryColor3uiv, /* 4133 */ __glXDisp_BlendFuncSeparate, /* 4134 */ +#else + __glXNoSuchRenderOpcode, /* 4124 */ + __glXNoSuchRenderOpcode, /* 4125 */ + __glXNoSuchRenderOpcode, /* 4126 */ + __glXNoSuchRenderOpcode, /* 4127 */ + __glXNoSuchRenderOpcode, /* 4128 */ + __glXNoSuchRenderOpcode, /* 4129 */ + __glXNoSuchRenderOpcode, /* 4130 */ + __glXNoSuchRenderOpcode, /* 4131 */ + __glXNoSuchRenderOpcode, /* 4132 */ + __glXNoSuchRenderOpcode, /* 4133 */ + __glXNoSuchRenderOpcode, /* 4134 */ +#endif __glXNoSuchRenderOpcode, /* 4135 */ __glXNoSuchRenderOpcode, /* 4136 */ __glXNoSuchRenderOpcode, /* 4137 */ @@ -2200,9 +2223,20 @@ __GLXdispatchRenderProcPtr __glXRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT - __ __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, /* 4219 */ +#ifndef MISSING_GL_EXTS __glXDisp_ActiveStencilFaceEXT, /* 4220 */ +# ifndef __DARWIN__ __glXDisp_PointParameteri, /* 4221 */ __glXDisp_PointParameteriv, /* 4222 */ +# else + __glXDisp_PointParameteriNV, /* 4221 */ + __glXDisp_PointParameterivNV, /* 4222 */ +# endif +#else + __glXNoSuchRenderOpcode, + __glXNoSuchRenderOpcode, + __glXNoSuchRenderOpcode, +#endif }; __GLXdispatchVendorPrivProcPtr __glXVendorPrivTable_EXT[__GLX_MAX_VENDPRIV_OPCODE_EXT - __GLX_MIN_VENDPRIV_OPCODE_EXT + 1] = { __glXDisp_AreTexturesResidentEXT, /* 11 */ @@ -2225,8 +2259,13 @@ __GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, +#ifndef MISSING_GL_EXTS __glXDispSwap_PointParameterfARB, /* 2065 */ __glXDispSwap_PointParameterfvARB, /* 2066 */ +#else + __glXNoSuchRenderOpcode, + __glXNoSuchRenderOpcode, +#endif __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, @@ -4284,6 +4323,7 @@ __GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT __glXDispSwap_CopyTexSubImage1D, /* 4121 */ __glXDispSwap_CopyTexSubImage2D, /* 4122 */ __glXDispSwap_CopyTexSubImage3D, /* 4123 */ +#ifndef MISSING_GL_EXTS __glXDispSwap_FogCoordfv, /* 4124 */ __glXDispSwap_FogCoorddv, /* 4125 */ __glXDispSwap_SecondaryColor3bv, /* 4126 */ @@ -4295,6 +4335,19 @@ __GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT __glXDispSwap_SecondaryColor3usv, /* 4132 */ __glXDispSwap_SecondaryColor3uiv, /* 4133 */ __glXDisp_BlendFuncSeparate, /* 4134 */ +#else + __glXNoSuchRenderOpcode, /* 4124 */ + __glXNoSuchRenderOpcode, /* 4125 */ + __glXNoSuchRenderOpcode, /* 4126 */ + __glXNoSuchRenderOpcode, /* 4127 */ + __glXNoSuchRenderOpcode, /* 4128 */ + __glXNoSuchRenderOpcode, /* 4129 */ + __glXNoSuchRenderOpcode, /* 4130 */ + __glXNoSuchRenderOpcode, /* 4131 */ + __glXNoSuchRenderOpcode, /* 4132 */ + __glXNoSuchRenderOpcode, /* 4133 */ + __glXNoSuchRenderOpcode, /* 4134 */ +#endif __glXNoSuchRenderOpcode, /* 4135 */ __glXNoSuchRenderOpcode, /* 4136 */ __glXNoSuchRenderOpcode, /* 4137 */ @@ -4380,9 +4433,20 @@ __GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, __glXNoSuchRenderOpcode, /* 4219 */ +#ifndef MISSING_GL_EXTS __glXDispSwap_ActiveStencilFaceEXT, /* 4220 */ +# ifndef __DARWIN__ __glXDispSwap_PointParameteri, /* 4221 */ __glXDispSwap_PointParameteriv, /* 4222 */ +# else + __glXDispSwap_PointParameteriNV, /* 4221 */ + __glXDispSwap_PointParameterivNV, /* 4222 */ +# endif +#else + __glXNoSuchRenderOpcode, + __glXNoSuchRenderOpcode, + __glXNoSuchRenderOpcode, +#endif }; __GLXdispatchVendorPrivProcPtr __glXSwapVendorPrivTable_EXT[__GLX_MAX_VENDPRIV_OPCODE_EXT - __GLX_MIN_VENDPRIV_OPCODE_EXT + 1] = { __glXDispSwap_AreTexturesResidentEXT, /* 11 */ diff --git a/GL/glx/g_disptab_EXT.h b/GL/glx/g_disptab_EXT.h index 52eb44324..33672379b 100644 --- a/GL/glx/g_disptab_EXT.h +++ b/GL/glx/g_disptab_EXT.h @@ -1,5 +1,9 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.h,v 1.3 2001/03/21 16:29:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.h,v 1.5 2004/01/28 18:11:50 alanh Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _GLX_g_disptab_EXT_h_ #define _GLX_g_disptab_EXT_h_ /* @@ -95,10 +99,17 @@ extern void __glXDispSwap_SecondaryColor3dv(GLbyte *); extern void __glXDisp_BlendFuncSeparate(GLbyte *); extern void __glXDispSwap_BlendFuncSeparate(GLbyte *); +#ifdef __DARWIN__ +extern void __glXDisp_PointParameteriNV(GLbyte *); +extern void __glXDisp_PointParameterivNV(GLbyte *); +extern void __glXDispSwap_PointParameteriNV(GLbyte *); +extern void __glXDispSwap_PointParameterivNV(GLbyte *); +#else extern void __glXDisp_PointParameteri(GLbyte *); extern void __glXDisp_PointParameteriv(GLbyte *); extern void __glXDispSwap_PointParameteri(GLbyte *); extern void __glXDispSwap_PointParameteriv(GLbyte *); +#endif extern void __glXDisp_ActiveStencilFaceEXT(GLbyte*); diff --git a/GL/glx/g_render.c b/GL/glx/g_render.c index f014e3be5..28d23da84 100644 --- a/GL/glx/g_render.c +++ b/GL/glx/g_render.c @@ -30,6 +30,10 @@ */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include "glxext.h" #include "g_disptab.h" diff --git a/GL/glx/g_renderswap.c b/GL/glx/g_renderswap.c index 5c2ed9f58..e22494ed2 100644 --- a/GL/glx/g_renderswap.c +++ b/GL/glx/g_renderswap.c @@ -29,6 +29,10 @@ */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include "glxext.h" #include "g_disptab.h" diff --git a/GL/glx/g_single.c b/GL/glx/g_single.c index 06529e8c5..a60bf44c1 100644 --- a/GL/glx/g_single.c +++ b/GL/glx/g_single.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.5 2002/01/14 22:47:08 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.5tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -29,6 +29,10 @@ */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include "glxext.h" #include "g_disptab.h" @@ -1264,7 +1268,6 @@ int __glXDisp_AreTexturesResident(__GLXclientState *cl, GLbyte *pc) int __glXDisp_DeleteTextures(__GLXclientState *cl, GLbyte *pc) { - GLsizei n; __GLXcontext *cx; int error; @@ -1273,7 +1276,6 @@ int __glXDisp_DeleteTextures(__GLXclientState *cl, GLbyte *pc) return error; } pc += __GLX_SINGLE_HDR_SIZE; - n = *(GLsizei *)(pc + 0); glDeleteTextures( *(GLsizei *)(pc + 0), @@ -1717,7 +1719,6 @@ int __glXDisp_AreTexturesResidentEXT(__GLXclientState *cl, GLbyte *pc) int __glXDisp_DeleteTexturesEXT(__GLXclientState *cl, GLbyte *pc) { - GLsizei n; __GLXcontext *cx; int error; @@ -1726,7 +1727,6 @@ int __glXDisp_DeleteTexturesEXT(__GLXclientState *cl, GLbyte *pc) return error; } pc += __GLX_VENDPRIV_HDR_SIZE; - n = *(GLsizei *)(pc + 0); glDeleteTexturesEXT( *(GLsizei *)(pc + 0), diff --git a/GL/glx/g_singleswap.c b/GL/glx/g_singleswap.c index 34515997e..026530374 100644 --- a/GL/glx/g_singleswap.c +++ b/GL/glx/g_singleswap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_singleswap.c,v 1.5 2002/01/14 22:47:08 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/g_singleswap.c,v 1.4tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -29,6 +29,10 @@ */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include "glxext.h" #include "g_disptab.h" diff --git a/GL/glx/global.c b/GL/glx/global.c index 9cd011ec9..ef9831ec0 100644 --- a/GL/glx/global.c +++ b/GL/glx/global.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/global.c,v 1.3 2001/03/21 16:29:35 dawes Exp $ */ +/* $XFree86$ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -35,6 +35,10 @@ */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" /* diff --git a/GL/glx/glxbuf.c b/GL/glx/glxbuf.c index 6e6f6142b..44be53614 100644 --- a/GL/glx/glxbuf.c +++ b/GL/glx/glxbuf.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.c,v 1.7 2001/10/31 22:50:26 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.c,v 1.6 2001/03/25 05:32:01 tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -34,6 +34,10 @@ ** */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include "glxutil.h" #include "glxbuf.h" diff --git a/GL/glx/glxbuf.h b/GL/glx/glxbuf.h index a298b3471..88b04e8bd 100644 --- a/GL/glx/glxbuf.h +++ b/GL/glx/glxbuf.h @@ -1,4 +1,8 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ +/* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _glxbuf_h_ #define _glxbuf_h_ diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c index f756d1830..f88ec2c99 100644 --- a/GL/glx/glxcmds.c +++ b/GL/glx/glxcmds.c @@ -36,6 +36,10 @@ #define NEED_REPLIES #define FONT_PCF +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include <GL/glxtokens.h> #include <unpack.h> diff --git a/GL/glx/glxcmdsswap.c b/GL/glx/glxcmdsswap.c index 450b8bb9b..595e814e5 100644 --- a/GL/glx/glxcmdsswap.c +++ b/GL/glx/glxcmdsswap.c @@ -36,6 +36,10 @@ #define NEED_REPLIES #define FONT_PCF +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include "glxutil.h" #include <GL/glxtokens.h> diff --git a/GL/glx/glxcontext.h b/GL/glx/glxcontext.h index 9a16851f0..18d8b44c2 100644 --- a/GL/glx/glxcontext.h +++ b/GL/glx/glxcontext.h @@ -1,4 +1,8 @@ /* $XFree86: xc/programs/Xserver/GL/glx/glxcontext.h,v 1.4 2002/02/22 21:45:07 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _GLX_context_h_ #define _GLX_context_h_ diff --git a/GL/glx/glxdrawable.h b/GL/glx/glxdrawable.h index 1d7f44352..38a05bfeb 100644 --- a/GL/glx/glxdrawable.h +++ b/GL/glx/glxdrawable.h @@ -1,4 +1,8 @@ /* $XFree86: xc/programs/Xserver/GL/glx/glxdrawable.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _GLX_drawable_h_ #define _GLX_drawable_h_ diff --git a/GL/glx/glxerror.h b/GL/glx/glxerror.h index 3c1e93c61..2c6d6d863 100644 --- a/GL/glx/glxerror.h +++ b/GL/glx/glxerror.h @@ -1,4 +1,8 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxerror.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ +/* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _GLX_error_h_ #define _GLX_error_h_ diff --git a/GL/glx/glxext.c b/GL/glx/glxext.c index c86540fa4..6e0ced935 100644 --- a/GL/glx/glxext.c +++ b/GL/glx/glxext.c @@ -19,6 +19,10 @@ */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include <windowstr.h> #include <propertyst.h> diff --git a/GL/glx/glxext.h b/GL/glx/glxext.h index c6cd219c7..41b4e83e6 100644 --- a/GL/glx/glxext.h +++ b/GL/glx/glxext.h @@ -1,4 +1,8 @@ /* $XFree86: xc/programs/Xserver/GL/glx/glxext.h,v 1.7 2003/11/17 22:20:26 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _glxext_h_ #define _glxext_h_ diff --git a/GL/glx/glxfb.c b/GL/glx/glxfb.c index 4ce952d51..0d433d25d 100644 --- a/GL/glx/glxfb.c +++ b/GL/glx/glxfb.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxfb.c,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ +/* $XFree86$ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -38,6 +38,10 @@ ** An implementation of a buffer which is part of the front buffer */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include "glxutil.h" #include "glxfb.h" diff --git a/GL/glx/glxfb.h b/GL/glx/glxfb.h index 44a72a3e2..325146d43 100644 --- a/GL/glx/glxfb.h +++ b/GL/glx/glxfb.h @@ -1,4 +1,8 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxfb.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ +/* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _glxfb_h_ #define _glxfb_h_ diff --git a/GL/glx/glximports.c b/GL/glx/glximports.c index b38456f6f..fae2346b9 100644 --- a/GL/glx/glximports.c +++ b/GL/glx/glximports.c @@ -34,6 +34,10 @@ ** */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include "glxcontext.h" #include "glximports.h" diff --git a/GL/glx/glximports.h b/GL/glx/glximports.h index 09d8340af..ef485822e 100644 --- a/GL/glx/glximports.h +++ b/GL/glx/glximports.h @@ -1,4 +1,8 @@ /* $XFree86: xc/programs/Xserver/GL/glx/glximports.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _glximports_h_ #define _glximports_h_ diff --git a/GL/glx/glxmem.c b/GL/glx/glxmem.c index 0c3ea25a7..21a7c7962 100644 --- a/GL/glx/glxmem.c +++ b/GL/glx/glxmem.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.c,v 1.7 2002/08/28 06:41:26 torrey Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.c,v 1.6 2001/10/31 22:50:27 tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -38,6 +38,10 @@ ** Implementation of a buffer in main memory */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include "glxmem.h" #include "glxext.h" diff --git a/GL/glx/glxmem.h b/GL/glx/glxmem.h index 93a277559..06720dfdf 100644 --- a/GL/glx/glxmem.h +++ b/GL/glx/glxmem.h @@ -1,4 +1,8 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ +/* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _glxmem_h_ #define _glxmem_h_ diff --git a/GL/glx/glxpix.c b/GL/glx/glxpix.c index b21d4ade9..98c033c98 100644 --- a/GL/glx/glxpix.c +++ b/GL/glx/glxpix.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.c,v 1.4 2001/03/21 16:29:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.c,v 1.3 2000/09/26 15:57:02 tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -38,6 +38,10 @@ ** An implementation of a glx pixmap buffer */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include "glxutil.h" #include "glxpix.h" diff --git a/GL/glx/glxpix.h b/GL/glx/glxpix.h index d7a9afab0..4b16352b4 100644 --- a/GL/glx/glxpix.h +++ b/GL/glx/glxpix.h @@ -1,4 +1,8 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ +/* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _glxpix_h_ #define _glxpix_h_ diff --git a/GL/glx/glxscreens.c b/GL/glx/glxscreens.c index 5a58f265d..4b228cb4f 100644 --- a/GL/glx/glxscreens.c +++ b/GL/glx/glxscreens.c @@ -34,6 +34,10 @@ ** */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef IN_MODULE #include <xf86_ansic.h> #else diff --git a/GL/glx/glxscreens.h b/GL/glx/glxscreens.h index c4d237bbc..2d68c8b60 100644 --- a/GL/glx/glxscreens.h +++ b/GL/glx/glxscreens.h @@ -1,3 +1,7 @@ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _GLX_screens_h_ #define _GLX_screens_h_ diff --git a/GL/glx/glxserver.h b/GL/glx/glxserver.h index 66d681d2d..a30a85381 100644 --- a/GL/glx/glxserver.h +++ b/GL/glx/glxserver.h @@ -1,4 +1,8 @@ /* $XFree86: xc/programs/Xserver/GL/glx/glxserver.h,v 1.5 2003/09/28 20:15:43 alanh Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _GLX_server_h_ #define _GLX_server_h_ diff --git a/GL/glx/glxutil.c b/GL/glx/glxutil.c index 4512aa5e9..03bc19f63 100644 --- a/GL/glx/glxutil.c +++ b/GL/glx/glxutil.c @@ -36,6 +36,10 @@ #define NEED_REPLIES #define FONT_PCF +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include <GL/glxtokens.h> #include <unpack.h> diff --git a/GL/glx/glxutil.h b/GL/glx/glxutil.h index dbf7084b5..2c3090a46 100644 --- a/GL/glx/glxutil.h +++ b/GL/glx/glxutil.h @@ -1,4 +1,8 @@ /* $XFree86: xc/programs/Xserver/GL/glx/glxutil.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _glxcmds_h_ #define _glxcmds_h_ diff --git a/GL/glx/impsize.h b/GL/glx/impsize.h index 8932fb33f..eee60cc3e 100644 --- a/GL/glx/impsize.h +++ b/GL/glx/impsize.h @@ -1,4 +1,8 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/impsize.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/impsize.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _impsize_h_ #define _impsize_h_ diff --git a/GL/glx/render2.c b/GL/glx/render2.c index 2629a7025..bc49d4fdd 100644 --- a/GL/glx/render2.c +++ b/GL/glx/render2.c @@ -35,6 +35,10 @@ */ /* #define NEED_REPLIES */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <glxserver.h> #include "unpack.h" #include "g_disptab.h" diff --git a/GL/glx/render2swap.c b/GL/glx/render2swap.c index 7c94b5268..64ba77e5a 100644 --- a/GL/glx/render2swap.c +++ b/GL/glx/render2swap.c @@ -35,6 +35,10 @@ */ /* #define NEED_REPLIES */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include "unpack.h" #include "g_disptab.h" diff --git a/GL/glx/renderpix.c b/GL/glx/renderpix.c index ad5625dd6..fc4034731 100644 --- a/GL/glx/renderpix.c +++ b/GL/glx/renderpix.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/renderpix.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */ +/* $XFree86$ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -35,6 +35,10 @@ */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include "unpack.h" #include "g_disptab.h" diff --git a/GL/glx/renderpixswap.c b/GL/glx/renderpixswap.c index 3b0e1f6b7..f356969f9 100644 --- a/GL/glx/renderpixswap.c +++ b/GL/glx/renderpixswap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/renderpixswap.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */ +/* $XFree86$ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -35,6 +35,10 @@ */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include "unpack.h" #include "g_disptab.h" diff --git a/GL/glx/rensize.c b/GL/glx/rensize.c index 5d7c7b367..9cedecfad 100644 --- a/GL/glx/rensize.c +++ b/GL/glx/rensize.c @@ -34,6 +34,10 @@ ** */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <GL/gl.h> #include "glxserver.h" #include "GL/glxproto.h" diff --git a/GL/glx/rensizetab.c b/GL/glx/rensizetab.c index 95ba462b2..41656890c 100644 --- a/GL/glx/rensizetab.c +++ b/GL/glx/rensizetab.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/rensizetab.c,v 1.3 2001/03/21 16:29:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/rensizetab.c,v 1.5 2004/01/28 18:11:53 alanh Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -34,6 +34,10 @@ ** */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include "g_disptab_EXT.h" diff --git a/GL/glx/single2.c b/GL/glx/single2.c index 5869e8f50..9fee5ff49 100644 --- a/GL/glx/single2.c +++ b/GL/glx/single2.c @@ -35,6 +35,10 @@ */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include "glxutil.h" #include "glxext.h" diff --git a/GL/glx/single2swap.c b/GL/glx/single2swap.c index c8c496871..dab98ade9 100644 --- a/GL/glx/single2swap.c +++ b/GL/glx/single2swap.c @@ -35,6 +35,10 @@ */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include "glxutil.h" #include "glxext.h" diff --git a/GL/glx/singlepix.c b/GL/glx/singlepix.c index 85be77d85..845c46a64 100644 --- a/GL/glx/singlepix.c +++ b/GL/glx/singlepix.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/singlepix.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */ +/* $XFree86$ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -35,6 +35,10 @@ */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include "glxext.h" #include "singlesize.h" diff --git a/GL/glx/singlepixswap.c b/GL/glx/singlepixswap.c index 2b488312e..ff68ecedf 100644 --- a/GL/glx/singlepixswap.c +++ b/GL/glx/singlepixswap.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/singlepixswap.c,v 1.6 2001/10/31 22:50:27 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/singlepixswap.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -35,6 +35,10 @@ */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include "glxext.h" #include "singlesize.h" diff --git a/GL/glx/singlesize.c b/GL/glx/singlesize.c index 3baf03517..04de960a9 100644 --- a/GL/glx/singlesize.c +++ b/GL/glx/singlesize.c @@ -34,6 +34,10 @@ ** */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <GL/gl.h> #include "glxserver.h" #include "singlesize.h" diff --git a/GL/glx/singlesize.h b/GL/glx/singlesize.h index 829338094..bde62092c 100644 --- a/GL/glx/singlesize.h +++ b/GL/glx/singlesize.h @@ -1,4 +1,8 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */ +/* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _singlesize_h_ #define _singlesize_h_ diff --git a/GL/glx/unpack.h b/GL/glx/unpack.h index 62fc43761..723fb85f3 100644 --- a/GL/glx/unpack.h +++ b/GL/glx/unpack.h @@ -1,4 +1,8 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/unpack.h,v 1.5 2002/10/30 12:52:03 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/unpack.h,v 1.4 2002/01/14 22:47:08 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef __GLX_unpack_h__ #define __GLX_unpack_h__ diff --git a/GL/glx/xfont.c b/GL/glx/xfont.c index 3ea767d2b..c4995e272 100644 --- a/GL/glx/xfont.c +++ b/GL/glx/xfont.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/xfont.c,v 1.3 2001/03/21 16:29:37 dawes Exp $ */ +/* $XFree86$ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -35,6 +35,10 @@ */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glxserver.h" #include "glxutil.h" #include "g_disptab.h" diff --git a/GL/include/GL/glx_ansic.h b/GL/include/GL/glx_ansic.h index c50288055..c94393fd1 100644 --- a/GL/include/GL/glx_ansic.h +++ b/GL/include/GL/glx_ansic.h @@ -1,7 +1,11 @@ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _glx_ansic_h_ #define _glx_ansic_h_ -/* $XFree86: xc/programs/Xserver/GL/include/GL/glx_ansic.h,v 1.7 2002/04/04 14:05:36 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/include/GL/glx_ansic.h,v 1.5 2001/03/21 20:49:08 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/include/GL/xf86glx.h b/GL/include/GL/xf86glx.h index 7a467b9b5..66f096a98 100644 --- a/GL/include/GL/xf86glx.h +++ b/GL/include/GL/xf86glx.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/include/GL/xf86glx.h,v 1.4 2000/02/23 04:46:54 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/include/GL/xf86glx.h,v 1.3 1999/06/14 07:31:41 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -32,6 +32,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "miscstruct.h" #ifdef XFree86LOADER diff --git a/GL/mesa/X/xf86glx.c b/GL/mesa/X/xf86glx.c index bd8ff7fe0..229e871fa 100644 --- a/GL/mesa/X/xf86glx.c +++ b/GL/mesa/X/xf86glx.c @@ -33,6 +33,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <regionstr.h> #include <resource.h> #include <GL/gl.h> diff --git a/GL/mesa/X/xf86glx_util.c b/GL/mesa/X/xf86glx_util.c index ff2654830..6441a4b4f 100644 --- a/GL/mesa/X/xf86glx_util.c +++ b/GL/mesa/X/xf86glx_util.c @@ -32,6 +32,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * Brian Paul <brian@precisioninsight.com> */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <gcstruct.h> #include "pixmapstr.h" #include "xf86glx_util.h" diff --git a/GL/mesa/X/xf86glx_util.h b/GL/mesa/X/xf86glx_util.h index 0716d6c7d..809c1550f 100644 --- a/GL/mesa/X/xf86glx_util.h +++ b/GL/mesa/X/xf86glx_util.h @@ -32,6 +32,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * Brian Paul <brian@precisioninsight.com> */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _XF86GLX_UTIL_H_ #define _XF86GLX_UTIL_H_ diff --git a/GL/mesa/X/xf86glxint.h b/GL/mesa/X/xf86glxint.h index 3d7dcec6f..8b893af6d 100644 --- a/GL/mesa/X/xf86glxint.h +++ b/GL/mesa/X/xf86glxint.h @@ -32,6 +32,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _XF86GLXINT_H_ #define _XF86GLXINT_H_ diff --git a/GL/windows/glwindows.h b/GL/windows/glwindows.h index 0e269a119..74e81f24f 100644 --- a/GL/windows/glwindows.h +++ b/GL/windows/glwindows.h @@ -1,3 +1,7 @@ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/Xwindows.h> #include <GL/gl.h> #include <GL/glext.h> diff --git a/GL/windows/glwrap.c b/GL/windows/glwrap.c index 646675765..730b74ed1 100755 --- a/GL/windows/glwrap.c +++ b/GL/windows/glwrap.c @@ -5,6 +5,10 @@ * Authors: Alexander Gottwald */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/Xwindows.h> #include <GL/gl.h> #include <GL/glext.h> diff --git a/GL/windows/indirect.c b/GL/windows/indirect.c index 4c46ec960..0c7457aa0 100755 --- a/GL/windows/indirect.c +++ b/GL/windows/indirect.c @@ -42,6 +42,10 @@ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "glwindows.h" #include <glcontextmodes.h> #include <stdint.h> diff --git a/XTrap/xtrapddmi.c b/XTrap/xtrapddmi.c index 240705989..2dba356b7 100644 --- a/XTrap/xtrapddmi.c +++ b/XTrap/xtrapddmi.c @@ -38,6 +38,10 @@ SOFTWARE. * */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef EXTMODULE #include <errno.h> #include <X11/Xos.h> diff --git a/XTrap/xtrapdi.c b/XTrap/xtrapdi.c index 8019addea..1435dcd80 100644 --- a/XTrap/xtrapdi.c +++ b/XTrap/xtrapdi.c @@ -51,6 +51,10 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef EXTMODULE #include <stdio.h> #include <errno.h> diff --git a/XTrap/xtrapdiswp.c b/XTrap/xtrapdiswp.c index 5f8709480..77aa0f1a3 100644 --- a/XTrap/xtrapdiswp.c +++ b/XTrap/xtrapdiswp.c @@ -45,6 +45,10 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #define NEED_REPLIES #define NEED_EVENTS diff --git a/XTrap/xtrapditbl.c b/XTrap/xtrapditbl.c index 1e2a14960..ae1586028 100644 --- a/XTrap/xtrapditbl.c +++ b/XTrap/xtrapditbl.c @@ -35,6 +35,10 @@ SOFTWARE. /*-----------------* * Include Files * *-----------------*/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #define NEED_REPLIES #define NEED_EVENTS diff --git a/Xext/EVI.c b/Xext/EVI.c index f4f0eea1f..b59180685 100644 --- a/Xext/EVI.c +++ b/Xext/EVI.c @@ -23,6 +23,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/Xext/EVI.c,v 3.10tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "dixstruct.h" diff --git a/Xext/EVIstruct.h b/Xext/EVIstruct.h index db5655f97..857e7565a 100644 --- a/Xext/EVIstruct.h +++ b/Xext/EVIstruct.h @@ -23,6 +23,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/Xext/EVIstruct.h,v 3.5 2003/07/16 01:38:28 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef EVI_STRUCT_H #define EVI_STRUCT_H diff --git a/Xext/appgroup.c b/Xext/appgroup.c index b8fb4420a..bd2d2f8d9 100644 --- a/Xext/appgroup.c +++ b/Xext/appgroup.c @@ -28,6 +28,10 @@ from The Open Group. #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/Xext/bigreq.c b/Xext/bigreq.c index 65b25a909..8b08ba5dc 100644 --- a/Xext/bigreq.c +++ b/Xext/bigreq.c @@ -29,6 +29,10 @@ from The Open Group. /* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.8 2003/10/28 23:08:43 tsi Exp $ */ #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/Xext/cup.c b/Xext/cup.c index 55b2930c1..1ce2885b7 100644 --- a/Xext/cup.c +++ b/Xext/cup.c @@ -28,6 +28,10 @@ in this Software without prior written authorization from The Open Group. #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/Xext/dpms.c b/Xext/dpms.c index 093410336..5739da6a2 100644 --- a/Xext/dpms.c +++ b/Xext/dpms.c @@ -35,6 +35,10 @@ Equipment Corporation. /* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.10tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/Xext/dpmsproc.h b/Xext/dpmsproc.h index 36ad391da..ae1e6e25a 100644 --- a/Xext/dpmsproc.h +++ b/Xext/dpmsproc.h @@ -2,6 +2,10 @@ /* Prototypes for functions that the DDX must provide */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _DPMSPROC_H_ #define _DPMSPROC_H_ diff --git a/Xext/dpmsstubs.c b/Xext/dpmsstubs.c index 24086084a..128c57bb0 100644 --- a/Xext/dpmsstubs.c +++ b/Xext/dpmsstubs.c @@ -30,6 +30,10 @@ Equipment Corporation. typedef int Bool; +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "dpmsproc.h" #define FALSE 0 diff --git a/Xext/fontcache.c b/Xext/fontcache.c index b49a0d417..57f788954 100644 --- a/Xext/fontcache.c +++ b/Xext/fontcache.c @@ -33,6 +33,10 @@ #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/Xext/mbuf.c b/Xext/mbuf.c index be520b0f8..51cc91a27 100644 --- a/Xext/mbuf.c +++ b/Xext/mbuf.c @@ -28,6 +28,10 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: mbuf.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "window.h" diff --git a/Xext/mbufbf.c b/Xext/mbufbf.c index 10550dc37..7af856b98 100644 --- a/Xext/mbufbf.c +++ b/Xext/mbufbf.c @@ -29,6 +29,10 @@ in this Software without prior written authorization from The Open Group. #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <X11/X.h> #include <X11/Xproto.h> diff --git a/Xext/mbufpx.c b/Xext/mbufpx.c index 1a96d0097..297614e43 100644 --- a/Xext/mbufpx.c +++ b/Xext/mbufpx.c @@ -28,6 +28,10 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: mbufpx.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <X11/X.h> #include <X11/Xproto.h> diff --git a/Xext/mitmisc.c b/Xext/mitmisc.c index e32642b28..18c58ab8f 100644 --- a/Xext/mitmisc.c +++ b/Xext/mitmisc.c @@ -30,6 +30,10 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: mitmisc.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c index f2a8a7cd5..1fa8756e2 100644 --- a/Xext/panoramiX.c +++ b/Xext/panoramiX.c @@ -26,6 +26,10 @@ Equipment Corporation. /* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.37tsi Exp $ */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <X11/X.h> #include <X11/Xproto.h> diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h index c4faa5a9a..6cbb94dd3 100644 --- a/Xext/panoramiX.h +++ b/Xext/panoramiX.h @@ -36,6 +36,10 @@ Equipment Corporation. * PanoramiX definitions */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _PANORAMIX_H_ #define _PANORAMIX_H_ diff --git a/Xext/panoramiXSwap.c b/Xext/panoramiXSwap.c index d86b744cd..51b816695 100644 --- a/Xext/panoramiXSwap.c +++ b/Xext/panoramiXSwap.c @@ -25,6 +25,10 @@ Equipment Corporation. ******************************************************************/ /* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.9 2003/07/16 01:38:29 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <X11/X.h> #include <X11/Xproto.h> diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c index 5a3060839..0b6183c42 100644 --- a/Xext/panoramiXprocs.c +++ b/Xext/panoramiXprocs.c @@ -28,6 +28,10 @@ Equipment Corporation. /* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.36tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <X11/X.h> #define NEED_REPLIES diff --git a/Xext/panoramiXsrv.h b/Xext/panoramiXsrv.h index 92800062e..dc3b3d805 100644 --- a/Xext/panoramiXsrv.h +++ b/Xext/panoramiXsrv.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/Xext/panoramiXsrv.h,v 1.8 2001/08/01 00:44:44 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _PANORAMIXSRV_H_ #define _PANORAMIXSRV_H_ diff --git a/Xext/sampleEVI.c b/Xext/sampleEVI.c index a3d137619..67caa5613 100644 --- a/Xext/sampleEVI.c +++ b/Xext/sampleEVI.c @@ -23,6 +23,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "dixstruct.h" diff --git a/Xext/saver.c b/Xext/saver.c index 0597bea9f..53ce7e4bc 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -32,6 +32,10 @@ in this Software without prior written authorization from the X Consortium. #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/Xext/security.c b/Xext/security.c index 75ca16765..767055cc5 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -27,6 +27,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.16tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "dixstruct.h" #include "extnsionst.h" #include "windowstr.h" diff --git a/Xext/shape.c b/Xext/shape.c index bf07eb180..81861186a 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -29,6 +29,10 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: shape.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/Xext/shm.c b/Xext/shm.c index de791c8bd..751d51fbe 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -31,6 +31,10 @@ in this Software without prior written authorization from The Open Group. #define SHM +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <sys/types.h> #ifndef Lynx #include <sys/ipc.h> diff --git a/Xext/sleepuntil.c b/Xext/sleepuntil.c index ce925adc5..b30f7fd8e 100644 --- a/Xext/sleepuntil.c +++ b/Xext/sleepuntil.c @@ -29,6 +29,10 @@ in this Software without prior written authorization from The Open Group. /* dixsleep.c - implement millisecond timeouts for X clients */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "sleepuntil.h" #include <X11/X.h> #include <X11/Xmd.h> diff --git a/Xext/sleepuntil.h b/Xext/sleepuntil.h index f8fcc6cb9..0b99148a4 100644 --- a/Xext/sleepuntil.h +++ b/Xext/sleepuntil.h @@ -25,6 +25,10 @@ * XFree86 Project. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _SLEEPUNTIL_H_ #define _SLEEPUNTIL_H_ 1 diff --git a/Xext/sync.c b/Xext/sync.c index 110ce206a..0d69c02bd 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -54,6 +54,10 @@ PERFORMANCE OF THIS SOFTWARE. #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/Xmd.h> diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c index dbd9496d7..ee3af3f72 100644 --- a/Xext/xcmisc.c +++ b/Xext/xcmisc.c @@ -30,6 +30,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> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/Xext/xevie.c b/Xext/xevie.c index d33f027a9..300f3c9f4 100644 --- a/Xext/xevie.c +++ b/Xext/xevie.c @@ -34,6 +34,10 @@ of the copyright holder. #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c index 761483441..145596782 100644 --- a/Xext/xf86bigfont.c +++ b/Xext/xf86bigfont.c @@ -35,6 +35,10 @@ * XLoadQueryFont). */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <sys/types.h> #ifdef HAS_SHM #if defined(linux) && (!defined(__GNU_LIBRARY__) || __GNU_LIBRARY__ < 2) diff --git a/Xext/xprint.c b/Xext/xprint.c index 965374fe1..86e74bee3 100644 --- a/Xext/xprint.c +++ b/Xext/xprint.c @@ -67,6 +67,10 @@ copyright holders. /* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.14tsi Exp $ */ #define _XP_PRINT_SERVER_ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xos.h> #define NEED_EVENTS diff --git a/Xext/xres.c b/Xext/xres.c index 7a8fa50b4..1d3105a28 100644 --- a/Xext/xres.c +++ b/Xext/xres.c @@ -6,6 +6,10 @@ #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 <X11/misc.h> diff --git a/Xext/xtest.c b/Xext/xtest.c index e9876b2b8..965f0845b 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -29,6 +29,10 @@ from The Open Group. */ /* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.10 2003/10/28 23:08:44 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #define NEED_EVENTS #include <X11/Xproto.h> diff --git a/Xext/xtest1dd.c b/Xext/xtest1dd.c index 1681d6c50..c232715ba 100644 --- a/Xext/xtest1dd.c +++ b/Xext/xtest1dd.c @@ -61,6 +61,10 @@ University of California. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <X11/Xos.h> #include <X11/X.h> diff --git a/Xext/xtest1dd.h b/Xext/xtest1dd.h index 60663dfb9..3130c7075 100644 --- a/Xext/xtest1dd.h +++ b/Xext/xtest1dd.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 XTEST1DD_H #define XTEST1DD_H 1 diff --git a/Xext/xtest1di.c b/Xext/xtest1di.c index cb8c86aae..bc35d0590 100644 --- a/Xext/xtest1di.c +++ b/Xext/xtest1di.c @@ -62,6 +62,10 @@ University of California. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <X11/X.h> #include <X11/Xproto.h> diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c index bf18e4587..709b75ca7 100644 --- a/Xext/xvdisp.c +++ b/Xext/xvdisp.c @@ -48,6 +48,10 @@ SOFTWARE. ** */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/Xext/xvdix.h b/Xext/xvdix.h index 99d918406..c2dfc7c82 100644 --- a/Xext/xvdix.h +++ b/Xext/xvdix.h @@ -23,6 +23,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.7 2001/05/07 21:37:51 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef XVDIX_H #define XVDIX_H /* diff --git a/Xext/xvmain.c b/Xext/xvmain.c index e6c644407..36046f89b 100644 --- a/Xext/xvmain.c +++ b/Xext/xvmain.c @@ -75,6 +75,10 @@ SOFTWARE. ** */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/Xext/xvmc.c b/Xext/xvmc.c index 05424fe02..65211faa0 100644 --- a/Xext/xvmc.c +++ b/Xext/xvmc.c @@ -2,6 +2,10 @@ #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/Xext/xvmcext.h b/Xext/xvmcext.h index c7eba30ad..77af41d41 100644 --- a/Xext/xvmcext.h +++ b/Xext/xvmcext.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/Xext/xvmcext.h,v 1.1 2001/04/07 11:04:21 alanh Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _XVMC_H #define _XVMC_H #include <X11/extensions/Xv.h> 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 diff --git a/Xprint/AttrValid.c b/Xprint/AttrValid.c index 86bfd14e5..b2b018216 100644 --- a/Xprint/AttrValid.c +++ b/Xprint/AttrValid.c @@ -30,6 +30,10 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <scrnintstr.h> #include "attributes.h" diff --git a/Xprint/AttrValid.h b/Xprint/AttrValid.h index 8e27ae01a..440bea06f 100644 --- a/Xprint/AttrValid.h +++ b/Xprint/AttrValid.h @@ -31,6 +31,10 @@ dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _Xp_AttrValid_h #define _Xp_AttrValid_h diff --git a/Xprint/DiPrint.h b/Xprint/DiPrint.h index c1a8dcb45..a26477971 100644 --- a/Xprint/DiPrint.h +++ b/Xprint/DiPrint.h @@ -38,6 +38,10 @@ copyright holders. * request will allow us to build it with the description in the locale of * the requesting client. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _XpDiPrint_H_ #define _XpDiPrint_H_ 1 diff --git a/Xprint/Init.c b/Xprint/Init.c index 44520507c..194e434f3 100644 --- a/Xprint/Init.c +++ b/Xprint/Init.c @@ -52,6 +52,10 @@ copyright holders. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <unistd.h> #include <stdlib.h> #include <stdio.h> diff --git a/Xprint/Oid.c b/Xprint/Oid.c index 575f50582..7f0acaf0b 100644 --- a/Xprint/Oid.c +++ b/Xprint/Oid.c @@ -31,6 +31,10 @@ dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "attributes.h" /* diff --git a/Xprint/Oid.h b/Xprint/Oid.h index 40bf79d07..820cd7563 100644 --- a/Xprint/Oid.h +++ b/Xprint/Oid.h @@ -31,6 +31,10 @@ dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _Xp_Oid_h #define _Xp_Oid_h diff --git a/Xprint/Util.c b/Xprint/Util.c index 595fb6ccf..c1696becf 100644 --- a/Xprint/Util.c +++ b/Xprint/Util.c @@ -33,6 +33,10 @@ copyright holders. /* $XFree86: xc/programs/Xserver/Xprint/Util.c,v 1.12 2001/08/01 00:44:45 tsi Exp $ */ /* To get the tempnam() prototype in <stdio.h> */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #if defined(linux) && defined(__STRICT_ANSI__) #undef __STRICT_ANSI__ #endif diff --git a/Xprint/ValTree.c b/Xprint/ValTree.c index 4b5aba2a8..6fa631617 100644 --- a/Xprint/ValTree.c +++ b/Xprint/ValTree.c @@ -32,6 +32,10 @@ copyright holders. */ /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "validate.h" diff --git a/Xprint/attributes.c b/Xprint/attributes.c index b015d648d..4e6d63f60 100644 --- a/Xprint/attributes.c +++ b/Xprint/attributes.c @@ -45,6 +45,10 @@ copyright holders. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/Xproto.h> #include <string.h> #include <stdlib.h> diff --git a/Xprint/attributes.h b/Xprint/attributes.h index 52f0fa484..40df4fd0b 100644 --- a/Xprint/attributes.h +++ b/Xprint/attributes.h @@ -31,6 +31,10 @@ dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _Xp_attributes_h #define _Xp_attributes_h 1 diff --git a/Xprint/ddxInit.c b/Xprint/ddxInit.c index 2bbdde3ae..be16a3799 100644 --- a/Xprint/ddxInit.c +++ b/Xprint/ddxInit.c @@ -31,6 +31,10 @@ dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xos.h> #include <X11/Xproto.h> diff --git a/Xprint/mediaSizes.c b/Xprint/mediaSizes.c index 8bbd8b381..aedf32f1f 100644 --- a/Xprint/mediaSizes.c +++ b/Xprint/mediaSizes.c @@ -48,6 +48,10 @@ copyright holders. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <unistd.h> #include <stdlib.h> #include <stdio.h> @@ -60,7 +64,7 @@ copyright holders. #include "screenint.h" #include <X11/misc.h> #include "scrnintstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "DiPrint.h" #include "attributes.h" diff --git a/Xprint/pcl/Pcl.h b/Xprint/pcl/Pcl.h index 92621d232..59656be1a 100644 --- a/Xprint/pcl/Pcl.h +++ b/Xprint/pcl/Pcl.h @@ -46,6 +46,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/Pcl.h,v 1.12 2001/12/21 21:02:05 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _PCL_H_ #define _PCL_H_ @@ -60,7 +64,7 @@ copyright holders. #include <X11/extensions/Printstr.h> #include "regionstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" diff --git a/Xprint/pcl/PclArc.c b/Xprint/pcl/PclArc.c index af32eb619..d675e1699 100644 --- a/Xprint/pcl/PclArc.c +++ b/Xprint/pcl/PclArc.c @@ -47,6 +47,10 @@ copyright holders. /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArc.c,v 1.4 1999/12/13 02:12:53 robin Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <math.h> #include <errno.h> diff --git a/Xprint/pcl/PclArea.c b/Xprint/pcl/PclArea.c index 00e6aff04..cfed7c866 100644 --- a/Xprint/pcl/PclArea.c +++ b/Xprint/pcl/PclArea.c @@ -46,6 +46,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArea.c,v 1.8 2001/01/17 22:36:30 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <sys/types.h> #include <sys/stat.h> diff --git a/Xprint/pcl/PclAttVal.c b/Xprint/pcl/PclAttVal.c index 88fcf23b5..adbd197fd 100644 --- a/Xprint/pcl/PclAttVal.c +++ b/Xprint/pcl/PclAttVal.c @@ -33,6 +33,10 @@ dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Pcl.h" #include "AttrValid.h" diff --git a/Xprint/pcl/PclAttr.c b/Xprint/pcl/PclAttr.c index 2612a821f..3cde053f1 100644 --- a/Xprint/pcl/PclAttr.c +++ b/Xprint/pcl/PclAttr.c @@ -45,6 +45,10 @@ dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Pcl.h" #include "attributes.h" diff --git a/Xprint/pcl/PclColor.c b/Xprint/pcl/PclColor.c index d5d2e022b..72c7e3f99 100644 --- a/Xprint/pcl/PclColor.c +++ b/Xprint/pcl/PclColor.c @@ -47,6 +47,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclColor.c,v 1.9tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <string.h> #include <stdlib.h> diff --git a/Xprint/pcl/PclCursor.c b/Xprint/pcl/PclCursor.c index e7288c9ec..f50c355e9 100644 --- a/Xprint/pcl/PclCursor.c +++ b/Xprint/pcl/PclCursor.c @@ -46,6 +46,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclCursor.c,v 1.3 1999/12/16 02:26:27 robin Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include "Pcl.h" diff --git a/Xprint/pcl/PclDef.h b/Xprint/pcl/PclDef.h index 2638748b2..275bd63ec 100644 --- a/Xprint/pcl/PclDef.h +++ b/Xprint/pcl/PclDef.h @@ -45,6 +45,10 @@ dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _PCLDEF_H_ #define _PCLDEF_H_ diff --git a/Xprint/pcl/PclFonts.c b/Xprint/pcl/PclFonts.c index d5eff48c7..591435faa 100644 --- a/Xprint/pcl/PclFonts.c +++ b/Xprint/pcl/PclFonts.c @@ -46,8 +46,12 @@ dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "regionstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "scrnintstr.h" diff --git a/Xprint/pcl/PclGC.c b/Xprint/pcl/PclGC.c index 67331a454..83ebb47e1 100644 --- a/Xprint/pcl/PclGC.c +++ b/Xprint/pcl/PclGC.c @@ -46,6 +46,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclGC.c,v 1.9 2001/01/19 18:34:28 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "gcstruct.h" #include "Pcl.h" diff --git a/Xprint/pcl/PclInit.c b/Xprint/pcl/PclInit.c index 3d0a731ac..8bedee7c3 100644 --- a/Xprint/pcl/PclInit.c +++ b/Xprint/pcl/PclInit.c @@ -78,6 +78,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclInit.c,v 1.11 2001/12/21 21:02:05 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <string.h> #include <sys/types.h> diff --git a/Xprint/pcl/PclLine.c b/Xprint/pcl/PclLine.c index aa72e8ff0..f2b564df8 100644 --- a/Xprint/pcl/PclLine.c +++ b/Xprint/pcl/PclLine.c @@ -46,6 +46,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclLine.c,v 1.6 1999/12/13 02:12:55 robin Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Pcl.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/Xprint/pcl/PclMisc.c b/Xprint/pcl/PclMisc.c index 9405a4e78..3a958e783 100644 --- a/Xprint/pcl/PclMisc.c +++ b/Xprint/pcl/PclMisc.c @@ -46,6 +46,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclMisc.c,v 1.10tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdlib.h> #include <signal.h> #include <sys/types.h> diff --git a/Xprint/pcl/PclPixel.c b/Xprint/pcl/PclPixel.c index 372a54e9f..bfad618ed 100644 --- a/Xprint/pcl/PclPixel.c +++ b/Xprint/pcl/PclPixel.c @@ -46,6 +46,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixel.c,v 1.6tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include "windowstr.h" diff --git a/Xprint/pcl/PclPixmap.c b/Xprint/pcl/PclPixmap.c index 178289bc1..9449dfdd6 100644 --- a/Xprint/pcl/PclPixmap.c +++ b/Xprint/pcl/PclPixmap.c @@ -46,6 +46,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixmap.c,v 1.3 1999/12/16 02:26:27 robin Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Pcl.h" #include "cfb.h" #include "cfb32.h" diff --git a/Xprint/pcl/PclPolygon.c b/Xprint/pcl/PclPolygon.c index ddfd9ef8a..41ba4b1c0 100644 --- a/Xprint/pcl/PclPolygon.c +++ b/Xprint/pcl/PclPolygon.c @@ -47,6 +47,10 @@ copyright holders. /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPolygon.c,v 1.6 1999/12/13 02:12:56 robin Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Pcl.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/Xprint/pcl/PclPrint.c b/Xprint/pcl/PclPrint.c index 663086266..701710253 100644 --- a/Xprint/pcl/PclPrint.c +++ b/Xprint/pcl/PclPrint.c @@ -45,6 +45,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPrint.c,v 1.7tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <string.h> #include <sys/types.h> diff --git a/Xprint/pcl/PclSFonts.c b/Xprint/pcl/PclSFonts.c index 121ed0077..287c5c14f 100644 --- a/Xprint/pcl/PclSFonts.c +++ b/Xprint/pcl/PclSFonts.c @@ -48,6 +48,10 @@ copyright holders. /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSFonts.c,v 1.7tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include "Pcl.h" diff --git a/Xprint/pcl/PclSFonts.h b/Xprint/pcl/PclSFonts.h index 5992c12af..fdd62f651 100644 --- a/Xprint/pcl/PclSFonts.h +++ b/Xprint/pcl/PclSFonts.h @@ -1,4 +1,8 @@ /* $Xorg: PclSFonts.h,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _PCLFONTS_H #define _PCLFONTS_H diff --git a/Xprint/pcl/PclSpans.c b/Xprint/pcl/PclSpans.c index 92261c977..51c0137fc 100644 --- a/Xprint/pcl/PclSpans.c +++ b/Xprint/pcl/PclSpans.c @@ -47,6 +47,10 @@ copyright holders. /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSpans.c,v 1.5 1999/12/13 02:12:57 robin Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Pcl.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/Xprint/pcl/PclText.c b/Xprint/pcl/PclText.c index a7f37be56..be794772c 100644 --- a/Xprint/pcl/PclText.c +++ b/Xprint/pcl/PclText.c @@ -46,6 +46,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclText.c,v 1.10tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef DO_TWO_BYTE_PCL #include "iconv.h" #endif /* DO_TWO_BYTE_PCL */ diff --git a/Xprint/pcl/PclWindow.c b/Xprint/pcl/PclWindow.c index 42a6f6234..cac5826e9 100644 --- a/Xprint/pcl/PclWindow.c +++ b/Xprint/pcl/PclWindow.c @@ -47,6 +47,10 @@ copyright holders. /* $XFree86: xc/programs/Xserver/Xprint/pcl/PclWindow.c,v 1.10tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <string.h> #include <sys/types.h> diff --git a/Xprint/pcl/Pclmap.h b/Xprint/pcl/Pclmap.h index 1a68faf1e..5224fd9e3 100644 --- a/Xprint/pcl/Pclmap.h +++ b/Xprint/pcl/Pclmap.h @@ -32,6 +32,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/pcl/Pclmap.h,v 1.5 2001/07/25 15:05:00 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _PCLMAP_H_ #define _PCLMAP_H_ diff --git a/Xprint/ps/Ps.h b/Xprint/ps/Ps.h index 8c47fc9e5..32a2b5346 100644 --- a/Xprint/ps/Ps.h +++ b/Xprint/ps/Ps.h @@ -75,6 +75,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _PS_H_ #define _PS_H_ @@ -94,7 +98,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/extensions/Printstr.h> #include "regionstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" diff --git a/Xprint/ps/PsArc.c b/Xprint/ps/PsArc.c index 76804bb18..511971e7a 100644 --- a/Xprint/ps/PsArc.c +++ b/Xprint/ps/PsArc.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include "Ps.h" diff --git a/Xprint/ps/PsArea.c b/Xprint/ps/PsArea.c index 7850da0f8..32a4d5cf4 100644 --- a/Xprint/ps/PsArea.c +++ b/Xprint/ps/PsArea.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Ps.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/Xprint/ps/PsAttVal.c b/Xprint/ps/PsAttVal.c index 5ebd0d3b9..fc23ffef5 100644 --- a/Xprint/ps/PsAttVal.c +++ b/Xprint/ps/PsAttVal.c @@ -33,6 +33,10 @@ dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Ps.h" #include "AttrValid.h" diff --git a/Xprint/ps/PsAttr.c b/Xprint/ps/PsAttr.c index 8a5bee9e3..74da5a0e1 100644 --- a/Xprint/ps/PsAttr.c +++ b/Xprint/ps/PsAttr.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Ps.h" #include "attributes.h" diff --git a/Xprint/ps/PsCache.c b/Xprint/ps/PsCache.c index 8c9f4a926..e69aa2eb7 100644 --- a/Xprint/ps/PsCache.c +++ b/Xprint/ps/PsCache.c @@ -73,11 +73,15 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Ps.h" #include "gcstruct.h" #include "windowstr.h" -#include "fntfil.h" -#include "fntfilst.h" +#include <X11/fonts/fntfil.h> +#include <X11/fonts/fntfilst.h> #define GET 0 #define RESET 1 diff --git a/Xprint/ps/PsColor.c b/Xprint/ps/PsColor.c index 3586a77b8..91a44f85a 100644 --- a/Xprint/ps/PsColor.c +++ b/Xprint/ps/PsColor.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Ps.h" #include "mi.h" #include "micmap.h" diff --git a/Xprint/ps/PsDef.h b/Xprint/ps/PsDef.h index ec648c442..cf45c8516 100644 --- a/Xprint/ps/PsDef.h +++ b/Xprint/ps/PsDef.h @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _PSDEF_H_ #define _PSDEF_H_ diff --git a/Xprint/ps/PsFTFonts.c b/Xprint/ps/PsFTFonts.c index cfdee93d1..2fbff1a1c 100644 --- a/Xprint/ps/PsFTFonts.c +++ b/Xprint/ps/PsFTFonts.c @@ -21,17 +21,21 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <ctype.h> #include <limits.h> #include <sys/stat.h> #include "regionstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "scrnintstr.h" -#include "fontxlfd.h" -#include "fntfil.h" -#include "fntfilst.h" +#include <X11/fonts/fontxlfd.h> +#include <X11/fonts/fntfil.h> +#include <X11/fonts/fntfilst.h> #include "Ps.h" diff --git a/Xprint/ps/PsFonts.c b/Xprint/ps/PsFonts.c index 6d0ba1a61..10c0b1a5b 100644 --- a/Xprint/ps/PsFonts.c +++ b/Xprint/ps/PsFonts.c @@ -74,13 +74,17 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "regionstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "scrnintstr.h" -#include "fontxlfd.h" -#include "fntfil.h" -#include "fntfilst.h" +#include <X11/fonts/fontxlfd.h> +#include <X11/fonts/fntfil.h> +#include <X11/fonts/fntfilst.h> #include "Ps.h" diff --git a/Xprint/ps/PsGC.c b/Xprint/ps/PsGC.c index c4984d075..56ff5cdae 100644 --- a/Xprint/ps/PsGC.c +++ b/Xprint/ps/PsGC.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Ps.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/Xprint/ps/PsImageUtil.c b/Xprint/ps/PsImageUtil.c index c32cb54bb..282786564 100644 --- a/Xprint/ps/PsImageUtil.c +++ b/Xprint/ps/PsImageUtil.c @@ -29,6 +29,10 @@ copyright holders. /* Please do not beat me for this ugly code - most of it has been stolen from * xc/lib/X11/ImUtil.c */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "gcstruct.h" #include "windowstr.h" #include "servermd.h" diff --git a/Xprint/ps/PsInit.c b/Xprint/ps/PsInit.c index 2abaf90b3..a11a61ae4 100644 --- a/Xprint/ps/PsInit.c +++ b/Xprint/ps/PsInit.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <string.h> #include <unistd.h> diff --git a/Xprint/ps/PsLine.c b/Xprint/ps/PsLine.c index 23e105804..2524769c8 100644 --- a/Xprint/ps/PsLine.c +++ b/Xprint/ps/PsLine.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Ps.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/Xprint/ps/PsMisc.c b/Xprint/ps/PsMisc.c index a4c585f0d..b8a3ba854 100644 --- a/Xprint/ps/PsMisc.c +++ b/Xprint/ps/PsMisc.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/Xos.h> /* for SIGCLD on pre-POSIX systems */ #include <stdio.h> #include "Ps.h" diff --git a/Xprint/ps/PsPixel.c b/Xprint/ps/PsPixel.c index c2c360d2e..2197f0ab9 100644 --- a/Xprint/ps/PsPixel.c +++ b/Xprint/ps/PsPixel.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include "windowstr.h" diff --git a/Xprint/ps/PsPixmap.c b/Xprint/ps/PsPixmap.c index 25a525b82..a698b375e 100644 --- a/Xprint/ps/PsPixmap.c +++ b/Xprint/ps/PsPixmap.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "windowstr.h" #include "gcstruct.h" diff --git a/Xprint/ps/PsPolygon.c b/Xprint/ps/PsPolygon.c index dca00fa21..a1ae67f8d 100644 --- a/Xprint/ps/PsPolygon.c +++ b/Xprint/ps/PsPolygon.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Ps.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/Xprint/ps/PsPrint.c b/Xprint/ps/PsPrint.c index 721e430ae..05e8e2588 100644 --- a/Xprint/ps/PsPrint.c +++ b/Xprint/ps/PsPrint.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <string.h> #include <sys/types.h> diff --git a/Xprint/ps/PsSpans.c b/Xprint/ps/PsSpans.c index a7370866e..d7652f8fb 100644 --- a/Xprint/ps/PsSpans.c +++ b/Xprint/ps/PsSpans.c @@ -75,6 +75,10 @@ in this Software without prior written authorization from The Open Group. ********************************************************************/ /* $XFree86: xc/programs/Xserver/Xprint/ps/PsSpans.c,v 1.8 2001/10/28 03:32:56 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Ps.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/Xprint/ps/PsText.c b/Xprint/ps/PsText.c index 8bb0b0fb2..228e407dc 100644 --- a/Xprint/ps/PsText.c +++ b/Xprint/ps/PsText.c @@ -74,11 +74,15 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "Ps.h" #include "gcstruct.h" #include "windowstr.h" -#include "fntfil.h" -#include "fntfilst.h" +#include <X11/fonts/fntfil.h> +#include <X11/fonts/fntfilst.h> #include <limits.h> int diff --git a/Xprint/ps/PsWindow.c b/Xprint/ps/PsWindow.c index 3a9a7ed2a..313e51f31 100644 --- a/Xprint/ps/PsWindow.c +++ b/Xprint/ps/PsWindow.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <string.h> #include <sys/wait.h> diff --git a/Xprint/ps/psout.c b/Xprint/ps/psout.c index 66764401c..ffaf863ed 100644 --- a/Xprint/ps/psout.c +++ b/Xprint/ps/psout.c @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdlib.h> #include <stdio.h> #include <X11/os.h> diff --git a/Xprint/ps/psout.h b/Xprint/ps/psout.h index d60717b55..8441d8d07 100644 --- a/Xprint/ps/psout.h +++ b/Xprint/ps/psout.h @@ -74,6 +74,10 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _psout_ #define _psout_ diff --git a/Xprint/ps/psout_ft.c b/Xprint/ps/psout_ft.c index 938c8b1ae..fbb7e3ec4 100644 --- a/Xprint/ps/psout_ft.c +++ b/Xprint/ps/psout_ft.c @@ -21,6 +21,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdlib.h> #include <stdio.h> #include <X11/os.h> @@ -32,11 +36,11 @@ THE SOFTWARE. #include FT_TYPE1_TABLES_H #include <X11/Xproto.h> -#include "font.h" -#include "fontstruct.h" -#include "fntfilst.h" -#include "fontutil.h" -#include "fontenc.h" +#include <X11/fonts/font.h> +#include <X11/fonts/fontstruct.h> +#include <X11/fonts/fntfilst.h> +#include <X11/fonts/fontutil.h> +#include <X11/fonts/fontenc.h> #include "ft.h" #include "ftfuncs.h" #include "servermd.h" /* needed for endian test (IMAGE_BYTE_ORDER) */ diff --git a/Xprint/ps/psout_ftpstype1.c b/Xprint/ps/psout_ftpstype1.c index 2e77653d2..6860eaf2a 100644 --- a/Xprint/ps/psout_ftpstype1.c +++ b/Xprint/ps/psout_ftpstype1.c @@ -22,6 +22,10 @@ THE SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdlib.h> #include <stdio.h> #include <errno.h> @@ -35,11 +39,11 @@ THE SOFTWARE. #include FT_FREETYPE_H #include <X11/Xproto.h> -#include "font.h" -#include "fontstruct.h" -#include "fntfilst.h" -#include "fontutil.h" -#include "fontenc.h" +#include <X11/fonts/font.h> +#include <X11/fonts/fontstruct.h> +#include <X11/fonts/fntfilst.h> +#include <X11/fonts/fontutil.h> +#include <X11/fonts/fontenc.h> #include "ft.h" #include "ftfuncs.h" diff --git a/Xprint/ps/psout_ftpstype3.c b/Xprint/ps/psout_ftpstype3.c index 82c5e5f05..1d9b00c7c 100644 --- a/Xprint/ps/psout_ftpstype3.c +++ b/Xprint/ps/psout_ftpstype3.c @@ -21,6 +21,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdlib.h> #include <stdio.h> #include <X11/os.h> @@ -59,11 +63,11 @@ THE SOFTWARE. #endif /* USE_FT_INTERNALS */ #include <X11/Xproto.h> -#include "font.h" -#include "fontstruct.h" -#include "fntfilst.h" -#include "fontutil.h" -#include "fontenc.h" +#include <X11/fonts/font.h> +#include <X11/fonts/fontstruct.h> +#include <X11/fonts/fntfilst.h> +#include <X11/fonts/fontutil.h> +#include <X11/fonts/fontenc.h> #include "ft.h" #include "ftfuncs.h" diff --git a/Xprint/ps/ttf2pt1wrap.c b/Xprint/ps/ttf2pt1wrap.c index bd5ef526e..57bb777d2 100644 --- a/Xprint/ps/ttf2pt1wrap.c +++ b/Xprint/ps/ttf2pt1wrap.c @@ -2,6 +2,10 @@ * Wrapper to add missing symbol to externally supplied code */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef Lynx extern int optind; extern char *optarg; diff --git a/Xprint/raster/Raster.c b/Xprint/raster/Raster.c index 5c69d44d2..3651c3f5d 100644 --- a/Xprint/raster/Raster.c +++ b/Xprint/raster/Raster.c @@ -48,6 +48,10 @@ copyright holders. ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <errno.h> #include <stdio.h> #include <string.h> diff --git a/Xprint/raster/Raster.h b/Xprint/raster/Raster.h index af6f3fa1f..d4dbc22d4 100644 --- a/Xprint/raster/Raster.h +++ b/Xprint/raster/Raster.h @@ -44,6 +44,10 @@ copyright holders. ** ********************************************************* ** ********************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _RASTER_H_ #define _RASTER_H_ diff --git a/Xprint/raster/RasterAttVal.c b/Xprint/raster/RasterAttVal.c index 811ac65ca..3bba176d1 100644 --- a/Xprint/raster/RasterAttVal.c +++ b/Xprint/raster/RasterAttVal.c @@ -32,6 +32,10 @@ copyright holders. */ /* $XFree86: xc/programs/Xserver/Xprint/raster/RasterAttVal.c,v 1.3 2001/10/31 22:50:29 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <X11/X.h> #include <X11/misc.h> diff --git a/Xprint/spooler.c b/Xprint/spooler.c index 8367a8438..f709c57ab 100644 --- a/Xprint/spooler.c +++ b/Xprint/spooler.c @@ -27,6 +27,10 @@ dealings in this Software without prior written authorization from said copyright holders. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <unistd.h> #include <stdlib.h> #include <stdio.h> diff --git a/Xprint/spooler.h b/Xprint/spooler.h index ac1257c55..4e9b4aefc 100644 --- a/Xprint/spooler.h +++ b/Xprint/spooler.h @@ -1,4 +1,8 @@ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef SPOOLER_H #define SPOOLER_H 1 @@ -52,6 +52,10 @@ SOFTWARE. written by drewry, september 1986 */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "pixmap.h" #include "region.h" #include "gc.h" diff --git a/afb/afbbitblt.c b/afb/afbbitblt.c index b7ec21dfa..0c1c6bb9f 100644 --- a/afb/afbbitblt.c +++ b/afb/afbbitblt.c @@ -49,6 +49,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbbitblt.c,v 5.25 94/04/17 20:28:16 dpw Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> diff --git a/afb/afbblt.c b/afb/afbblt.c index 11c791921..6cbb0a878 100644 --- a/afb/afbblt.c +++ b/afb/afbblt.c @@ -33,6 +33,10 @@ Author: Keith Packard */ /* $XConsortium: afbblt.c,v 1.11 94/04/17 20:28:16 dpw Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/afb/afbbres.c b/afb/afbbres.c index 5922bd8e1..baf8d996f 100644 --- a/afb/afbbres.c +++ b/afb/afbbres.c @@ -49,6 +49,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbbres.c,v 1.22 94/04/17 20:28:17 dpw Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "afb.h" diff --git a/afb/afbbresd.c b/afb/afbbresd.c index 13cbf6a1f..a5a9cd134 100644 --- a/afb/afbbresd.c +++ b/afb/afbbresd.c @@ -48,6 +48,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbbresd.c,v 1.10 94/04/17 20:28:18 dpw Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "afb.h" diff --git a/afb/afbbstore.c b/afb/afbbstore.c index 050177ecf..a74a9d9b8 100644 --- a/afb/afbbstore.c +++ b/afb/afbbstore.c @@ -31,6 +31,10 @@ from the X Consortium. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "afb.h" #include <X11/X.h> #include "mibstore.h" diff --git a/afb/afbclip.c b/afb/afbclip.c index 2d4385806..ea7413233 100644 --- a/afb/afbclip.c +++ b/afb/afbclip.c @@ -48,6 +48,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbclip.c,v 5.6 94/04/17 20:28:19 dpw Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "regionstr.h" #include "pixmapstr.h" diff --git a/afb/afbcmap.c b/afb/afbcmap.c index c43725aa4..69b5d7ca4 100644 --- a/afb/afbcmap.c +++ b/afb/afbcmap.c @@ -29,6 +29,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "scrnintstr.h" diff --git a/afb/afbfillarc.c b/afb/afbfillarc.c index 60d7d758c..17b4902d9 100644 --- a/afb/afbfillarc.c +++ b/afb/afbfillarc.c @@ -28,6 +28,10 @@ in this Software without prior written authorization from the X Consortium. /* $XConsortium: afbfillarc.c,v 5.14 94/04/17 20:28:20 dpw Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "regionstr.h" diff --git a/afb/afbfillrct.c b/afb/afbfillrct.c index 83863a0a7..3646d78c6 100644 --- a/afb/afbfillrct.c +++ b/afb/afbfillrct.c @@ -49,6 +49,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbfillrct.c,v 5.10 94/04/17 20:28:21 dpw Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "pixmapstr.h" diff --git a/afb/afbfillsp.c b/afb/afbfillsp.c index 3af84e6bf..ffb633409 100644 --- a/afb/afbfillsp.c +++ b/afb/afbfillsp.c @@ -49,6 +49,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbfillsp.c,v 5.13 94/04/17 20:28:21 dpw Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "gcstruct.h" diff --git a/afb/afbfont.c b/afb/afbfont.c index 8b1c95783..bf77825f1 100644 --- a/afb/afbfont.c +++ b/afb/afbfont.c @@ -48,11 +48,15 @@ SOFTWARE. */ /* $XConsortium: afbfont.c,v 1.18 94/04/17 20:28:22 keith Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "afb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "scrnintstr.h" diff --git a/afb/afbgc.c b/afb/afbgc.c index cfd9abdc9..e9f4c52b7 100644 --- a/afb/afbgc.c +++ b/afb/afbgc.c @@ -48,12 +48,16 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbgc.c,v 5.35 94/04/17 20:28:23 dpw Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "afb.h" #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "gcstruct.h" #include "windowstr.h" #include "pixmapstr.h" diff --git a/afb/afbgetsp.c b/afb/afbgetsp.c index 2bdd1675a..10384615a 100644 --- a/afb/afbgetsp.c +++ b/afb/afbgetsp.c @@ -49,6 +49,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbgetsp.c,v 5.10 94/04/17 20:28:24 dpw Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> diff --git a/afb/afbhrzvert.c b/afb/afbhrzvert.c index 6f27c2540..d7ddce1a1 100644 --- a/afb/afbhrzvert.c +++ b/afb/afbhrzvert.c @@ -49,6 +49,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbhrzvert.c,v 1.15 94/04/17 20:28:24 dpw Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gc.h" diff --git a/afb/afbimage.c b/afb/afbimage.c index c5225cf9b..353fd6f89 100644 --- a/afb/afbimage.c +++ b/afb/afbimage.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/afb/afbimage.c,v 3.2 1998/03/20 21:04:55 hohndel Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" #include "pixmapstr.h" diff --git a/afb/afbimggblt.c b/afb/afbimggblt.c index 3444b4eec..28113b448 100644 --- a/afb/afbimggblt.c +++ b/afb/afbimggblt.c @@ -49,11 +49,15 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbimggblt.c,v 5.17 94/04/17 20:28:25 dpw Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "afb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/afb/afbline.c b/afb/afbline.c index 6d59ee3b6..255ea21c1 100644 --- a/afb/afbline.c +++ b/afb/afbline.c @@ -48,6 +48,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbline.c,v 5.18 94/04/17 20:28:26 dpw Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" diff --git a/afb/afbmisc.c b/afb/afbmisc.c index ee6511831..08ebc62f7 100644 --- a/afb/afbmisc.c +++ b/afb/afbmisc.c @@ -48,6 +48,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbmisc.c,v 5.4 94/04/17 20:28:27 dpw Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "cursor.h" diff --git a/afb/afbpixmap.c b/afb/afbpixmap.c index 3d1245125..a155c101b 100644 --- a/afb/afbpixmap.c +++ b/afb/afbpixmap.c @@ -54,6 +54,10 @@ SOFTWARE. on a monchrome device, a pixmap is a bitmap. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/Xmd.h> #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/afb/afbply1rct.c b/afb/afbply1rct.c index d1c714753..90e55cf8e 100644 --- a/afb/afbply1rct.c +++ b/afb/afbply1rct.c @@ -28,6 +28,10 @@ in this Software without prior written authorization from the X Consortium. * Author: Keith Packard, MIT X Consortium */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" diff --git a/afb/afbplygblt.c b/afb/afbplygblt.c index 774f83799..7d4f5ddd7 100644 --- a/afb/afbplygblt.c +++ b/afb/afbplygblt.c @@ -49,11 +49,15 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbimggblt.c,v 5.17 94/04/17 20:28:25 dpw Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "afb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/afb/afbpntarea.c b/afb/afbpntarea.c index ab3031b92..648a2d19c 100644 --- a/afb/afbpntarea.c +++ b/afb/afbpntarea.c @@ -49,6 +49,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbpntarea.c,v 5.7 94/04/17 20:28:29 dpw Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" diff --git a/afb/afbpntwin.c b/afb/afbpntwin.c index ee652b244..aaa6847a9 100644 --- a/afb/afbpntwin.c +++ b/afb/afbpntwin.c @@ -49,6 +49,10 @@ SOFTWARE. ******************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" diff --git a/afb/afbpolypnt.c b/afb/afbpolypnt.c index 8ae40e091..4e9fa0310 100644 --- a/afb/afbpolypnt.c +++ b/afb/afbpolypnt.c @@ -49,6 +49,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbpolypnt.c,v 5.6 94/04/17 20:28:30 dpw Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "pixmapstr.h" diff --git a/afb/afbpushpxl.c b/afb/afbpushpxl.c index c8b123b95..e62181188 100644 --- a/afb/afbpushpxl.c +++ b/afb/afbpushpxl.c @@ -48,6 +48,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbpushpxl.c,v 5.6 94/04/17 20:28:31 dpw Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" #include "scrnintstr.h" diff --git a/afb/afbscrinit.c b/afb/afbscrinit.c index 6e82c9d60..2e10ad885 100644 --- a/afb/afbscrinit.c +++ b/afb/afbscrinit.c @@ -48,6 +48,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbscrinit.c,v 5.17 94/04/17 20:28:34 dpw Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> /* for xColorItem */ #include <X11/Xmd.h> diff --git a/afb/afbsetsp.c b/afb/afbsetsp.c index 6aeb3c603..f039cd9f0 100644 --- a/afb/afbsetsp.c +++ b/afb/afbsetsp.c @@ -49,6 +49,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbsetsp.c,v 5.8 94/04/17 20:28:34 dpw Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> diff --git a/afb/afbtegblt.c b/afb/afbtegblt.c index 5159cda8f..16f6ca4ea 100644 --- a/afb/afbtegblt.c +++ b/afb/afbtegblt.c @@ -49,11 +49,15 @@ SOFTWARE. ******************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "afb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/afb/afbtile.c b/afb/afbtile.c index 3dc543dbe..11d76abdf 100644 --- a/afb/afbtile.c +++ b/afb/afbtile.c @@ -49,6 +49,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: afbtile.c,v 5.8 94/04/17 20:28:36 dpw Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" diff --git a/afb/afbwindow.c b/afb/afbwindow.c index 678c8f1b9..443dd5aed 100644 --- a/afb/afbwindow.c +++ b/afb/afbwindow.c @@ -49,6 +49,10 @@ SOFTWARE. ******************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" diff --git a/afb/afbzerarc.c b/afb/afbzerarc.c index 645ac8f4c..ef62238db 100644 --- a/afb/afbzerarc.c +++ b/afb/afbzerarc.c @@ -34,6 +34,10 @@ in this Software without prior written authorization from the X Consortium. * The Computer Journal, November 1967, Volume 10, Number 3, pp. 282-289 */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "regionstr.h" @@ -29,6 +29,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/cfb/cfb.h,v 3.29tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #if !defined(__CFB_H__) || defined(CFB_PROTOTYPES_ONLY) #include <X11/X.h> diff --git a/cfb/cfb16.h b/cfb/cfb16.h index 3d51cd142..1ad8972ef 100644 --- a/cfb/cfb16.h +++ b/cfb/cfb16.h @@ -25,6 +25,10 @@ * XFree86 Project. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _CFB16_H_ #define _CFB16_H_ diff --git a/cfb/cfb24.h b/cfb/cfb24.h index f1876f74d..3a99934b7 100644 --- a/cfb/cfb24.h +++ b/cfb/cfb24.h @@ -25,6 +25,10 @@ * XFree86 Project. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _CFB24_H_ #define _CFB24_H_ diff --git a/cfb/cfb32.h b/cfb/cfb32.h index 5ea4c13c8..48b48cbaf 100644 --- a/cfb/cfb32.h +++ b/cfb/cfb32.h @@ -25,6 +25,10 @@ * XFree86 Project. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _CFB32_H_ #define _CFB32_H_ diff --git a/cfb/cfb8bit.c b/cfb/cfb8bit.c index 4d10cb0ce..0bc5debbb 100644 --- a/cfb/cfb8bit.c +++ b/cfb/cfb8bit.c @@ -35,6 +35,10 @@ from The Open Group. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #if PSZ == 8 #include <X11/X.h> diff --git a/cfb/cfb8bit.h b/cfb/cfb8bit.h index 2bfdace35..767549af7 100644 --- a/cfb/cfb8bit.h +++ b/cfb/cfb8bit.h @@ -36,6 +36,10 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: cfb8bit.h,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "servermd.h" #if (BITMAP_BIT_ORDER == MSBFirst) diff --git a/cfb/cfb8line.c b/cfb/cfb8line.c index 74e10cc03..0f27f1d47 100644 --- a/cfb/cfb8line.c +++ b/cfb/cfb8line.c @@ -29,6 +29,10 @@ in this Software without prior written authorization from The Open Group. * Jeff Anton'x fixes: cfb8line.c 97/02/07 */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" diff --git a/cfb/cfballpriv.c b/cfb/cfballpriv.c index 4739589d8..68edb281b 100644 --- a/cfb/cfballpriv.c +++ b/cfb/cfballpriv.c @@ -27,6 +27,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/cfb/cfballpriv.c,v 1.11 2001/01/30 22:06:15 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/cfb/cfbbitblt.c b/cfb/cfbbitblt.c index 0a68c0712..a9dd438fe 100644 --- a/cfb/cfbbitblt.c +++ b/cfb/cfbbitblt.c @@ -33,6 +33,10 @@ Author: Keith Packard */ /* $Xorg: cfbbitblt.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/cfb/cfbblt.c b/cfb/cfbblt.c index 06e271640..7a0b192cc 100644 --- a/cfb/cfbblt.c +++ b/cfb/cfbblt.c @@ -34,6 +34,10 @@ Author: Keith Packard /* 24-bit bug fixes: Peter Wainwright, 1998/11/28 */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/cfb/cfbbres.c b/cfb/cfbbres.c index ee20c981e..fc6de4898 100644 --- a/cfb/cfbbres.c +++ b/cfb/cfbbres.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: cfbbres.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "cfb.h" diff --git a/cfb/cfbbresd.c b/cfb/cfbbresd.c index 44c8e0c8e..ada5034d5 100644 --- a/cfb/cfbbresd.c +++ b/cfb/cfbbresd.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: cfbbresd.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "cfb.h" diff --git a/cfb/cfbbstore.c b/cfb/cfbbstore.c index 1ca165524..64adc4050 100644 --- a/cfb/cfbbstore.c +++ b/cfb/cfbbstore.c @@ -17,6 +17,10 @@ */ /* $Xorg: cfbbstore.c,v 1.3 2000/08/17 19:48:13 cpqbld Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "cfb.h" #include <X11/X.h> #include "mibstore.h" diff --git a/cfb/cfbcmap.c b/cfb/cfbcmap.c index 7d7f39a0e..a7777eda8 100644 --- a/cfb/cfbcmap.c +++ b/cfb/cfbcmap.c @@ -30,6 +30,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* $XFree86: xc/programs/Xserver/cfb/cfbcmap.c,v 3.12 2000/02/12 03:39:23 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "scrnintstr.h" diff --git a/cfb/cfbcppl.c b/cfb/cfbcppl.c index b2b53999b..037a516f2 100644 --- a/cfb/cfbcppl.c +++ b/cfb/cfbcppl.c @@ -27,6 +27,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/cfb/cfbcppl.c,v 1.6 2001/12/14 19:59:22 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "gcstruct.h" diff --git a/cfb/cfbfillarc.c b/cfb/cfbfillarc.c index 837067ff9..6fb6bb728 100644 --- a/cfb/cfbfillarc.c +++ b/cfb/cfbfillarc.c @@ -27,6 +27,10 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: cfbfillarc.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "regionstr.h" diff --git a/cfb/cfbfillrct.c b/cfb/cfbfillrct.c index 4ea3177d1..657865114 100644 --- a/cfb/cfbfillrct.c +++ b/cfb/cfbfillrct.c @@ -30,6 +30,10 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: cfbfillrct.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/cfb/cfbfillsp.c b/cfb/cfbfillsp.c index d460fad1d..efb462b6c 100644 --- a/cfb/cfbfillsp.c +++ b/cfb/cfbfillsp.c @@ -77,6 +77,10 @@ SOFTWARE. /* $Xorg: cfbfillsp.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/cfb/cfbgc.c b/cfb/cfbgc.c index 3937bd649..9cf53d35b 100644 --- a/cfb/cfbgc.c +++ b/cfb/cfbgc.c @@ -48,11 +48,15 @@ SOFTWARE. /* $Xorg: cfbgc.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "cfb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/cfb/cfbgetsp.c b/cfb/cfbgetsp.c index b3d5b91c3..08651a9ba 100644 --- a/cfb/cfbgetsp.c +++ b/cfb/cfbgetsp.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/cfb/cfbgetsp.c,v 3.9tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/cfb/cfbglblt8.c b/cfb/cfbglblt8.c index 290970a50..fda848fde 100644 --- a/cfb/cfbglblt8.c +++ b/cfb/cfbglblt8.c @@ -30,11 +30,15 @@ in this Software without prior written authorization from The Open Group. * only. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "cfb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/cfb/cfbhrzvert.c b/cfb/cfbhrzvert.c index 408f60533..4df991b00 100644 --- a/cfb/cfbhrzvert.c +++ b/cfb/cfbhrzvert.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: cfbhrzvert.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gc.h" diff --git a/cfb/cfbigblt8.c b/cfb/cfbigblt8.c index c0ea250f6..97356e8bd 100644 --- a/cfb/cfbigblt8.c +++ b/cfb/cfbigblt8.c @@ -28,12 +28,16 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/Xserver/cfb/cfbigblt8.c,v 1.5 2001/10/28 03:33:01 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "mi.h" #include "cfb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/cfb/cfbimage.c b/cfb/cfbimage.c index 44c27151b..ce3909e63 100644 --- a/cfb/cfbimage.c +++ b/cfb/cfbimage.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: cfbimage.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" #include "pixmapstr.h" diff --git a/cfb/cfbline.c b/cfb/cfbline.c index 8fec8fbd0..392fe483e 100644 --- a/cfb/cfbline.c +++ b/cfb/cfbline.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: cfbline.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" diff --git a/cfb/cfbmap.h b/cfb/cfbmap.h index 802517aac..9ed10acaa 100644 --- a/cfb/cfbmap.h +++ b/cfb/cfbmap.h @@ -32,6 +32,10 @@ in this Software without prior written authorization from The Open Group. * Map names around so that multiple depths can be supported simultaneously */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #if 0 #undef QuartetBitsTable #undef QuartetPixelMaskTable diff --git a/cfb/cfbmskbits.c b/cfb/cfbmskbits.c index cc21efc35..05954e62c 100644 --- a/cfb/cfbmskbits.c +++ b/cfb/cfbmskbits.c @@ -48,6 +48,10 @@ bit index 32-n in a longword see also cfbmskbits.h */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <servermd.h> diff --git a/cfb/cfbmskbits.h b/cfb/cfbmskbits.h index a803cac72..8d6f118df 100644 --- a/cfb/cfbmskbits.h +++ b/cfb/cfbmskbits.h @@ -31,6 +31,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* $Xorg: cfbmskbits.h,v 1.3 2000/08/17 19:48:14 cpqbld Exp $ */ /* Optimizations for PSZ == 32 added by Kyle Marvin (marvin@vitec.com) */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/cfb/cfbpixmap.c b/cfb/cfbpixmap.c index 46bd90f6f..f7e06bd13 100644 --- a/cfb/cfbpixmap.c +++ b/cfb/cfbpixmap.c @@ -52,6 +52,10 @@ SOFTWARE. on a monchrome device, a pixmap is a bitmap. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/Xmd.h> #include "servermd.h" #include "scrnintstr.h" diff --git a/cfb/cfbply1rct.c b/cfb/cfbply1rct.c index 5d2213682..99a2379c9 100644 --- a/cfb/cfbply1rct.c +++ b/cfb/cfbply1rct.c @@ -27,6 +27,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/cfb/cfbply1rct.c,v 3.10 2003/10/29 22:44:53 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" diff --git a/cfb/cfbpntwin.c b/cfb/cfbpntwin.c index 9cb1c7b1d..9bfdfe64f 100644 --- a/cfb/cfbpntwin.c +++ b/cfb/cfbpntwin.c @@ -48,6 +48,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.7tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" diff --git a/cfb/cfbpolypnt.c b/cfb/cfbpolypnt.c index 607fc1b3c..59ef0cf89 100644 --- a/cfb/cfbpolypnt.c +++ b/cfb/cfbpolypnt.c @@ -27,6 +27,10 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: cfbpolypnt.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" #include "windowstr.h" diff --git a/cfb/cfbpush8.c b/cfb/cfbpush8.c index 26e509c37..3492c8e25 100644 --- a/cfb/cfbpush8.c +++ b/cfb/cfbpush8.c @@ -30,6 +30,10 @@ in this Software without prior written authorization from The Open Group. */ /* $Xorg: cfbpush8.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #if PSZ == 8 #include <X11/X.h> diff --git a/cfb/cfbrctstp8.c b/cfb/cfbrctstp8.c index e8509b029..9f753cdd7 100644 --- a/cfb/cfbrctstp8.c +++ b/cfb/cfbrctstp8.c @@ -32,6 +32,10 @@ Author: Keith Packard, MIT X Consortium /* $Xorg: cfbrctstp8.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #if PSZ == 8 #include <X11/X.h> diff --git a/cfb/cfbrrop.c b/cfb/cfbrrop.c index 909d03a9b..77487bc6a 100644 --- a/cfb/cfbrrop.c +++ b/cfb/cfbrrop.c @@ -29,6 +29,10 @@ in this Software without prior written authorization from The Open Group. /* cfb reduced rasterop computations */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/cfb/cfbrrop.h b/cfb/cfbrrop.h index cfa3a93fa..6deb7b899 100644 --- a/cfb/cfbrrop.h +++ b/cfb/cfbrrop.h @@ -28,6 +28,10 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/Xserver/cfb/cfbrrop.h,v 3.10tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef GXcopy #include <X11/X.h> #endif diff --git a/cfb/cfbscrinit.c b/cfb/cfbscrinit.c index 2aae7d5a0..7299bbdf8 100644 --- a/cfb/cfbscrinit.c +++ b/cfb/cfbscrinit.c @@ -29,6 +29,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $Xorg: cfbscrinit.c,v 1.3 2000/08/17 19:48:15 cpqbld Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/cfb/cfbsetsp.c b/cfb/cfbsetsp.c index 9bf126a12..7501d938b 100644 --- a/cfb/cfbsetsp.c +++ b/cfb/cfbsetsp.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/cfb/cfbsetsp.c,v 3.5tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/cfb/cfbsolid.c b/cfb/cfbsolid.c index 1fd3acf02..9f9093647 100644 --- a/cfb/cfbsolid.c +++ b/cfb/cfbsolid.c @@ -28,6 +28,10 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/Xserver/cfb/cfbsolid.c,v 3.8tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/cfb/cfbtab.h b/cfb/cfbtab.h index f81855103..d95efd66d 100644 --- a/cfb/cfbtab.h +++ b/cfb/cfbtab.h @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _CFBTAB_H_ #define _CFBTAB_H_ diff --git a/cfb/cfbteblt8.c b/cfb/cfbteblt8.c index 2be72262e..f58a07dc6 100644 --- a/cfb/cfbteblt8.c +++ b/cfb/cfbteblt8.c @@ -31,13 +31,17 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: cfbteblt8.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #if PSZ == 8 #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "cfb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/cfb/cfbtegblt.c b/cfb/cfbtegblt.c index 8893479b3..e3fb06f59 100644 --- a/cfb/cfbtegblt.c +++ b/cfb/cfbtegblt.c @@ -47,11 +47,15 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/cfb/cfbtegblt.c,v 3.6tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "cfb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/cfb/cfbtile32.c b/cfb/cfbtile32.c index c9f64f15c..96e5620b7 100644 --- a/cfb/cfbtile32.c +++ b/cfb/cfbtile32.c @@ -31,6 +31,10 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: cfbtile32.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/cfb/cfbtileodd.c b/cfb/cfbtileodd.c index dd5860894..6c46aa4db 100644 --- a/cfb/cfbtileodd.c +++ b/cfb/cfbtileodd.c @@ -31,6 +31,10 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: cfbtileodd.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/cfb/cfbwindow.c b/cfb/cfbwindow.c index 2c5eada23..7160f5436 100644 --- a/cfb/cfbwindow.c +++ b/cfb/cfbwindow.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/cfb/cfbwindow.c,v 1.5tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" diff --git a/cfb/cfbzerarc.c b/cfb/cfbzerarc.c index 358658afc..a9e0b2f9d 100644 --- a/cfb/cfbzerarc.c +++ b/cfb/cfbzerarc.c @@ -33,6 +33,10 @@ in this Software without prior written authorization from The Open Group. * The Computer Journal, November 1967, Volume 10, Number 3, pp. 282-289 */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "regionstr.h" diff --git a/composite/compalloc.c b/composite/compalloc.c index 2e4eeb0c7..005c16209 100644 --- a/composite/compalloc.c +++ b/composite/compalloc.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/composite/compext.c b/composite/compext.c index 477066024..e2b316edd 100644 --- a/composite/compext.c +++ b/composite/compext.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/composite/compinit.c b/composite/compinit.c index 5109a74fa..bc4099ba7 100644 --- a/composite/compinit.c +++ b/composite/compinit.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/composite/compint.h b/composite/compint.h index c5f283c95..989e5ed94 100644 --- a/composite/compint.h +++ b/composite/compint.h @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _COMPINT_H_ #define _COMPINT_H_ diff --git a/composite/compwindow.c b/composite/compwindow.c index c7ea98c13..f12cdf7ae 100644 --- a/composite/compwindow.c +++ b/composite/compwindow.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/damageext/damageext.c b/damageext/damageext.c index e18cad072..26015c435 100755 --- a/damageext/damageext.c +++ b/damageext/damageext.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/damageext/damageext.h b/damageext/damageext.h index 683c02734..fb58483a0 100644 --- a/damageext/damageext.h +++ b/damageext/damageext.h @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _DAMAGEEXT_H_ #define _DAMAGEEXT_H_ diff --git a/damageext/damageextint.h b/damageext/damageextint.h index 2f7b3ab45..4e1a29e44 100644 --- a/damageext/damageextint.h +++ b/damageext/damageextint.h @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _DAMAGEEXTINT_H_ #define _DAMAGEEXTINT_H_ @@ -37,6 +37,10 @@ /* INCLUDES */ #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "scrnintstr.h" diff --git a/dbe/dbestruct.h b/dbe/dbestruct.h index 13d09dea2..35deae8a9 100644 --- a/dbe/dbestruct.h +++ b/dbe/dbestruct.h @@ -33,6 +33,10 @@ /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef DBE_STRUCT_H #define DBE_STRUCT_H diff --git a/dbe/midbe.c b/dbe/midbe.c index 48a42daee..c639583f1 100644 --- a/dbe/midbe.c +++ b/dbe/midbe.c @@ -37,6 +37,10 @@ #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/dbe/midbe.h b/dbe/midbe.h index 3f9bb0090..1110578cd 100644 --- a/dbe/midbe.h +++ b/dbe/midbe.h @@ -33,6 +33,10 @@ /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef MIDBE_H #define MIDBE_H diff --git a/dbe/midbestr.h b/dbe/midbestr.h index 8c351072e..248b44857 100644 --- a/dbe/midbestr.h +++ b/dbe/midbestr.h @@ -32,6 +32,10 @@ *****************************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef MIDBE_STRUCT_H #define MIDBE_STRUCT_H diff --git a/dix/atom.c b/dix/atom.c index e337bfcd3..fbfa60716 100644 --- a/dix/atom.c +++ b/dix/atom.c @@ -48,6 +48,10 @@ SOFTWARE. /* $Xorg: atom.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xatom.h> #include <X11/misc.h> diff --git a/dix/colormap.c b/dix/colormap.c index d64b9db23..5d2d40f28 100644 --- a/dix/colormap.c +++ b/dix/colormap.c @@ -49,6 +49,10 @@ SOFTWARE. /* $Xorg: colormap.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #define NEED_EVENTS #include <X11/Xproto.h> diff --git a/dix/cursor.c b/dix/cursor.c index 11b4629cf..f4d6c6419 100644 --- a/dix/cursor.c +++ b/dix/cursor.c @@ -49,6 +49,10 @@ SOFTWARE. /* $Xorg: cursor.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/dix/devices.c b/dix/devices.c index 82dabcf0f..97ad3af37 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -50,6 +50,10 @@ SOFTWARE. /* $Xorg: devices.c,v 1.4 2001/02/09 02:04:39 xorgcvs Exp $ */ /* $XdotOrg: xc/programs/Xserver/dix/devices.c,v 1.5 2005/05/22 01:12:49 alanc Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "resource.h" diff --git a/dix/dispatch.c b/dix/dispatch.c index 09445e038..0fed6a0e7 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -78,13 +78,17 @@ Equipment Corporation. /* $XFree86: xc/programs/Xserver/dix/dispatch.c,v 3.32 2003/11/10 18:21:45 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef PANORAMIX_DEBUG #include <stdio.h> int ProcInitialConnection(); #endif #include "windowstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "selection.h" diff --git a/dix/dispatch.h b/dix/dispatch.h index ba43bdca2..89ea2dd7e 100644 --- a/dix/dispatch.h +++ b/dix/dispatch.h @@ -30,6 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * extension.c, property.c. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef DISPATCH_H #define DISPATCH_H 1 diff --git a/dix/dixfonts.c b/dix/dixfonts.c index cbdd044e4..5d11480f5 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -52,6 +52,10 @@ Equipment Corporation. /* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/dix/dixutils.c b/dix/dixutils.c index ac5636f93..7ce248959 100644 --- a/dix/dixutils.c +++ b/dix/dixutils.c @@ -84,6 +84,10 @@ Author: Adobe Systems Incorporated /* $Xorg: dixutils.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/misc.h> diff --git a/dix/events.c b/dix/events.c index aea54187d..7db0d81e6 100644 --- a/dix/events.c +++ b/dix/events.c @@ -111,6 +111,10 @@ of the copyright holder. /* $Xorg: events.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "resource.h" diff --git a/dix/extension.c b/dix/extension.c index f65565df2..a3f83291c 100644 --- a/dix/extension.c +++ b/dix/extension.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: extension.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #define NEED_EVENTS #define NEED_REPLIES @@ -48,6 +48,10 @@ SOFTWARE. /* $Xorg: gc.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/dix/globals.c b/dix/globals.c index 3c15c5a0a..67267eda1 100644 --- a/dix/globals.c +++ b/dix/globals.c @@ -49,6 +49,10 @@ SOFTWARE. /* $Xorg: globals.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/misc.h> diff --git a/dix/glyphcurs.c b/dix/glyphcurs.c index 5499cabc5..20c7ba2a3 100644 --- a/dix/glyphcurs.c +++ b/dix/glyphcurs.c @@ -47,8 +47,12 @@ SOFTWARE. /* $Xorg: glyphcurs.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/misc.h> -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "scrnintstr.h" #include "gcstruct.h" diff --git a/dix/grabs.c b/dix/grabs.c index 5887d2aab..d3f88294d 100644 --- a/dix/grabs.c +++ b/dix/grabs.c @@ -48,6 +48,10 @@ SOFTWARE. */ /* $XFree86: xc/programs/Xserver/dix/grabs.c,v 3.4 2002/02/19 11:09:22 alanh Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #define NEED_EVENTS diff --git a/dix/initatoms.c b/dix/initatoms.c index 96b758b77..d25c20d70 100644 --- a/dix/initatoms.c +++ b/dix/initatoms.c @@ -3,6 +3,10 @@ * Do not change! Changing this file implies a protocol change! */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xatom.h> #include <X11/misc.h> diff --git a/dix/main.c b/dix/main.c index a8e4f05a4..f047e790a 100644 --- a/dix/main.c +++ b/dix/main.c @@ -80,6 +80,10 @@ Equipment Corporation. /* $TOG: main.c /main/86 1998/02/09 14:20:03 kaleb $ */ #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xos.h> /* for unistd.h */ #include <X11/Xproto.h> @@ -94,7 +98,7 @@ Equipment Corporation. #include "colormap.h" #include "colormapst.h" #include "cursorstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "opaque.h" #include "servermd.h" #include "site.h" diff --git a/dix/pixmap.c b/dix/pixmap.c index eef23673f..e77ddaf66 100644 --- a/dix/pixmap.c +++ b/dix/pixmap.c @@ -28,6 +28,10 @@ from The Open Group. */ /* $XFree86: xc/programs/Xserver/dix/pixmap.c,v 3.4 2001/01/17 22:36:44 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include <X11/misc.h> diff --git a/dix/privates.c b/dix/privates.c index 905fe3d50..1b384d080 100644 --- a/dix/privates.c +++ b/dix/privates.c @@ -29,6 +29,10 @@ from The Open Group. */ /* $XFree86: xc/programs/Xserver/dix/privates.c,v 3.7 2001/01/17 22:36:44 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include <X11/misc.h> diff --git a/dix/property.c b/dix/property.c index dec5a91d8..cabe46ecc 100644 --- a/dix/property.c +++ b/dix/property.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: property.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #define NEED_REPLIES #define NEED_EVENTS diff --git a/dix/resource.c b/dix/resource.c index 9f3794bd3..62481d0c1 100644 --- a/dix/resource.c +++ b/dix/resource.c @@ -102,6 +102,10 @@ Equipment Corporation. /* $XFree86: xc/programs/Xserver/dix/resource.c,v 3.13 2003/09/24 02:43:13 dawes Exp $ */ #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include <X11/os.h> diff --git a/dix/swaprep.c b/dix/swaprep.c index 5d1284c08..b424ffcfa 100644 --- a/dix/swaprep.c +++ b/dix/swaprep.c @@ -48,13 +48,17 @@ SOFTWARE. /* $Xorg: swaprep.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #define NEED_REPLIES #define NEED_EVENTS #include <X11/Xproto.h> #include <X11/misc.h> #include "dixstruct.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "scrnintstr.h" #include "swaprep.h" #include "globals.h" diff --git a/dix/swapreq.c b/dix/swapreq.c index 2e8acaee9..ec19cf2a6 100644 --- a/dix/swapreq.c +++ b/dix/swapreq.c @@ -48,6 +48,10 @@ SOFTWARE. /* $Xorg: swapreq.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #define NEED_EVENTS #include <X11/Xproto.h> diff --git a/dix/tables.c b/dix/tables.c index 092abd61f..5196f0e85 100644 --- a/dix/tables.c +++ b/dix/tables.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: tables.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #define NEED_EVENTS #define NEED_REPLIES diff --git a/dix/window.c b/dix/window.c index 858d65089..dba641d4a 100644 --- a/dix/window.c +++ b/dix/window.c @@ -80,6 +80,10 @@ Equipment Corporation. /* $XFree86: xc/programs/Xserver/dix/window.c,v 3.36 2003/11/14 23:52:50 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/misc.h> #include "scrnintstr.h" #include <X11/os.h> diff --git a/dix/xpstubs.c b/dix/xpstubs.c index 5f69e6119..09338eb92 100644 --- a/dix/xpstubs.c +++ b/dix/xpstubs.c @@ -27,8 +27,12 @@ from The Open Group. /* $Xorg: xpstubs.c,v 1.5 2001/03/08 17:52:08 pookie Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/misc.h> -#include "font.h" +#include <X11/fonts/font.h> #ifdef XPRINT #include "DiPrint.h" #endif @@ -26,7 +26,7 @@ #include <config.h> #endif #include "exaPriv.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "xf86str.h" #include "xf86.h" diff --git a/exa/exa_accel.c b/exa/exa_accel.c index 73f1d932d..e2ef7a0e5 100644 --- a/exa/exa_accel.c +++ b/exa/exa_accel.c @@ -26,7 +26,7 @@ #include <config.h> #endif #include "exaPriv.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "xf86str.h" #include "xf86.h" diff --git a/exa/exa_migration.c b/exa/exa_migration.c index 73f1d932d..e2ef7a0e5 100644 --- a/exa/exa_migration.c +++ b/exa/exa_migration.c @@ -26,7 +26,7 @@ #include <config.h> #endif #include "exaPriv.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "xf86str.h" #include "xf86.h" @@ -24,6 +24,10 @@ /* $XdotOrg: xc/programs/Xserver/fb/fb.h,v 1.9 2005/04/20 12:25:19 daniels Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _FB_H_ #define _FB_H_ diff --git a/fb/fb24_32.c b/fb/fb24_32.c index 2bdad1f3a..214e2e6dd 100644 --- a/fb/fb24_32.c +++ b/fb/fb24_32.c @@ -23,6 +23,10 @@ * Author: Keith Packard, SuSE, Inc. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef XFree86LOADER #include "xf86.h" #include "xf86_ansic.h" diff --git a/fb/fb24_32.h b/fb/fb24_32.h index 74e04a183..3c83f3423 100644 --- a/fb/fb24_32.h +++ b/fb/fb24_32.h @@ -23,6 +23,10 @@ * Author: Keith Packard, SuSE, Inc. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _FB24_32_H_ #define _FB24_32_H_ diff --git a/fb/fballpriv.c b/fb/fballpriv.c index 59d76d333..75b577049 100644 --- a/fb/fballpriv.c +++ b/fb/fballpriv.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fballpriv.c,v 1.3 2000/02/23 20:29:41 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #ifdef FB_SCREEN_PRIVATE diff --git a/fb/fbarc.c b/fb/fbarc.c index d7e0688b1..315aa181c 100644 --- a/fb/fbarc.c +++ b/fb/fbarc.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbarc.c,v 1.7tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #include "mizerarc.h" #ifdef IN_MODULE diff --git a/fb/fbbits.c b/fb/fbbits.c index a6bcd5b6a..ab67b4cf3 100644 --- a/fb/fbbits.c +++ b/fb/fbbits.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbbits.c,v 1.5 2000/02/17 14:16:22 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #include "miline.h" #include "mizerarc.h" diff --git a/fb/fbbits.h b/fb/fbbits.h index 69b254452..699782229 100644 --- a/fb/fbbits.h +++ b/fb/fbbits.h @@ -29,6 +29,10 @@ #define isClipped(c,ul,lr) ((((c) - (ul)) | ((lr) - (c))) & 0x80008000) +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef BITSMUL #define MUL BITSMUL #else diff --git a/fb/fbblt.c b/fb/fbblt.c index b5daf1096..131707dc6 100644 --- a/fb/fbblt.c +++ b/fb/fbblt.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbblt.c,v 1.7 2000/09/22 05:58:01 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #define InitializeShifts(sx,dx,ls,rs) { \ diff --git a/fb/fbbltone.c b/fb/fbbltone.c index ca45207b5..59ba3932e 100644 --- a/fb/fbbltone.c +++ b/fb/fbbltone.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbbltone.c,v 1.11 2001/09/07 15:15:31 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" /* diff --git a/fb/fbbstore.c b/fb/fbbstore.c index c74eaa240..01ec9b7e0 100644 --- a/fb/fbbstore.c +++ b/fb/fbbstore.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbbstore.c,v 1.1 1999/11/19 13:53:42 hohndel Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" void diff --git a/fb/fbcmap.c b/fb/fbcmap.c index 4eacd194b..762c51c9d 100644 --- a/fb/fbcmap.c +++ b/fb/fbcmap.c @@ -30,6 +30,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "scrnintstr.h" diff --git a/fb/fbcompose.c b/fb/fbcompose.c index 5b735fcc4..8cb0c86cc 100644 --- a/fb/fbcompose.c +++ b/fb/fbcompose.c @@ -24,6 +24,10 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/fb/fbcopy.c b/fb/fbcopy.c index 9adccd71b..eb295a397 100644 --- a/fb/fbcopy.c +++ b/fb/fbcopy.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbcopy.c,v 1.13 2003/11/10 18:21:47 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #ifdef IN_MODULE #include "xf86_ansic.h" diff --git a/fb/fbedge.c b/fb/fbedge.c index 7a383020b..f3311c6df 100644 --- a/fb/fbedge.c +++ b/fb/fbedge.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/fb/fbedgeimp.h b/fb/fbedgeimp.h index 4a91adc19..136a15e36 100644 --- a/fb/fbedgeimp.h +++ b/fb/fbedgeimp.h @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef rasterizeSpan #endif diff --git a/fb/fbfill.c b/fb/fbfill.c index 5ab7019ad..3c4959959 100644 --- a/fb/fbfill.c +++ b/fb/fbfill.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbfill.c,v 1.5 2003/01/29 00:43:33 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #include "fbmmx.h" diff --git a/fb/fbfillrect.c b/fb/fbfillrect.c index 43b2e6b15..2a60da165 100644 --- a/fb/fbfillrect.c +++ b/fb/fbfillrect.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbfillrect.c,v 1.1 1999/11/19 13:53:43 hohndel Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" void diff --git a/fb/fbfillsp.c b/fb/fbfillsp.c index e5e322d85..e2bb71e3a 100644 --- a/fb/fbfillsp.c +++ b/fb/fbfillsp.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbfillsp.c,v 1.1 1999/11/19 13:53:43 hohndel Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" void @@ -24,6 +24,10 @@ /* $XdotOrg: xc/programs/Xserver/fb/fbgc.c,v 1.3 2004/12/04 00:42:50 kuhn Exp $ */ /* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.14 2003/12/18 15:22:32 alanh Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #ifdef IN_MODULE #include "xf86_ansic.h" diff --git a/fb/fbgetsp.c b/fb/fbgetsp.c index de69be3cc..7c58dcb82 100644 --- a/fb/fbgetsp.c +++ b/fb/fbgetsp.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbgetsp.c,v 1.5 2000/05/06 21:09:33 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" void diff --git a/fb/fbglyph.c b/fb/fbglyph.c index c2a265c12..b97f0c0b3 100644 --- a/fb/fbglyph.c +++ b/fb/fbglyph.c @@ -23,8 +23,12 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #define dummyScreen screenInfo.screens[0] diff --git a/fb/fbimage.c b/fb/fbimage.c index 171993a0a..96bd8cf95 100644 --- a/fb/fbimage.c +++ b/fb/fbimage.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbimage.c,v 1.7 2001/05/29 04:54:09 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #ifdef XFree86LOADER #include "xf86.h" diff --git a/fb/fbline.c b/fb/fbline.c index ad684604f..8e99dd99f 100644 --- a/fb/fbline.c +++ b/fb/fbline.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" void diff --git a/fb/fbmmx.c b/fb/fbmmx.c index 9db335b44..d9c3af2ed 100644 --- a/fb/fbmmx.c +++ b/fb/fbmmx.c @@ -26,6 +26,10 @@ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef USE_MMX #include "fb.h" diff --git a/fb/fbmmx.h b/fb/fbmmx.h index 39e8d1e9c..9ec8affd7 100644 --- a/fb/fbmmx.h +++ b/fb/fbmmx.h @@ -22,6 +22,10 @@ * * Based on work by Owen Taylor */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef USE_MMX #ifndef __amd64__ diff --git a/fb/fboverlay.c b/fb/fboverlay.c index c165df9c4..e777d8e06 100644 --- a/fb/fboverlay.c +++ b/fb/fboverlay.c @@ -25,6 +25,10 @@ /* $XdotOrg: xc/programs/Xserver/fb/fboverlay.c,v 1.5 2004/12/04 00:42:50 kuhn Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #include "fboverlay.h" diff --git a/fb/fboverlay.h b/fb/fboverlay.h index e6a4e033f..a0eb8c7c4 100644 --- a/fb/fboverlay.h +++ b/fb/fboverlay.h @@ -23,6 +23,10 @@ * Author: Keith Packard, SuSE, Inc. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _FBOVERLAY_H_ #define _FBOVERLAY_H_ diff --git a/fb/fbpict.c b/fb/fbpict.c index c269b5eae..40dd2853c 100644 --- a/fb/fbpict.c +++ b/fb/fbpict.c @@ -23,6 +23,10 @@ * Author: Keith Packard, SuSE, Inc. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #ifdef RENDER diff --git a/fb/fbpict.h b/fb/fbpict.h index 3e751e9f0..35f8ec34e 100644 --- a/fb/fbpict.h +++ b/fb/fbpict.h @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _FBPICT_H_ #define _FBPICT_H_ diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c index 482b30f57..1cb34e4d9 100644 --- a/fb/fbpixmap.c +++ b/fb/fbpixmap.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbpixmap.c,v 1.9 2001/05/29 04:54:09 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #ifdef IN_MODULE #include "xf86_ansic.h" diff --git a/fb/fbpoint.c b/fb/fbpoint.c index 4bf345d93..5ba24e0e5 100644 --- a/fb/fbpoint.c +++ b/fb/fbpoint.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbpoint.c,v 1.7 2000/09/22 05:58:01 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" typedef void (*FbDots) (FbBits *dst, diff --git a/fb/fbpseudocolor.c b/fb/fbpseudocolor.c index 43a9f4ff5..ef40b7073 100644 --- a/fb/fbpseudocolor.c +++ b/fb/fbpseudocolor.c @@ -1,12 +1,16 @@ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "scrnintstr.h" #include "colormapst.h" #include "glyphstr.h" #include "resource.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "micmap.h" #include "fb.h" #include "fbpseudocolor.h" diff --git a/fb/fbpseudocolor.h b/fb/fbpseudocolor.h index 64de71db8..c653fbcab 100644 --- a/fb/fbpseudocolor.h +++ b/fb/fbpseudocolor.h @@ -1,3 +1,7 @@ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _FB_XX_H_ # define _FB_XX_H_ diff --git a/fb/fbpush.c b/fb/fbpush.c index 09485cfbe..8f1336963 100644 --- a/fb/fbpush.c +++ b/fb/fbpush.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbpush.c,v 1.3 2000/02/14 19:20:30 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" void diff --git a/fb/fbrop.h b/fb/fbrop.h index 65f62c393..541071b19 100644 --- a/fb/fbrop.h +++ b/fb/fbrop.h @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbrop.h,v 1.3 2000/02/14 19:20:30 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _FBROP_H_ #define _FBROP_H_ diff --git a/fb/fbscreen.c b/fb/fbscreen.c index 750b9e556..804503e12 100644 --- a/fb/fbscreen.c +++ b/fb/fbscreen.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbscreen.c,v 1.13 2001/05/29 04:54:09 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" Bool diff --git a/fb/fbseg.c b/fb/fbseg.c index 71474bbd2..18a996e0c 100644 --- a/fb/fbseg.c +++ b/fb/fbseg.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbseg.c,v 1.7 2001/01/17 07:40:02 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #include "miline.h" diff --git a/fb/fbsetsp.c b/fb/fbsetsp.c index 9e6d1a08f..eefc2da82 100644 --- a/fb/fbsetsp.c +++ b/fb/fbsetsp.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbsetsp.c,v 1.4 2000/05/06 21:09:34 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" void diff --git a/fb/fbsolid.c b/fb/fbsolid.c index d727e4d01..89effe63b 100644 --- a/fb/fbsolid.c +++ b/fb/fbsolid.c @@ -24,6 +24,10 @@ #define FbSelectPart(xor,o,t) xor +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" void diff --git a/fb/fbstipple.c b/fb/fbstipple.c index 7c9271590..44aa5f331 100644 --- a/fb/fbstipple.c +++ b/fb/fbstipple.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbstipple.c,v 1.6 2000/02/23 20:29:47 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #ifndef FBNOPIXADDR diff --git a/fb/fbtile.c b/fb/fbtile.c index 09bf97f1f..ef3242241 100644 --- a/fb/fbtile.c +++ b/fb/fbtile.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbtile.c,v 1.3 2000/02/12 03:39:43 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" /* diff --git a/fb/fbtrap.c b/fb/fbtrap.c index 09bff0bfd..863969527 100644 --- a/fb/fbtrap.c +++ b/fb/fbtrap.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #ifdef RENDER diff --git a/fb/fbutil.c b/fb/fbutil.c index e35f0db03..8153ab364 100644 --- a/fb/fbutil.c +++ b/fb/fbutil.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbutil.c,v 1.4 2000/02/23 20:29:48 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" FbBits diff --git a/fb/fbwindow.c b/fb/fbwindow.c index 4968d29af..8820856b0 100644 --- a/fb/fbwindow.c +++ b/fb/fbwindow.c @@ -24,6 +24,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbwindow.c,v 1.10tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #ifdef IN_MODULE #include "xf86_ansic.h" diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c index 1731b92cd..57673d746 100644 --- a/hw/dmx/dmx.c +++ b/hw/dmx/dmx.c @@ -43,6 +43,10 @@ * Please see the Client-to-Server DMX Extension to the X Protocol * document for details about the protocol. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/hw/dmx/dmxfont.c b/hw/dmx/dmxfont.c index 171d306c3..4ce736bf8 100644 --- a/hw/dmx/dmxfont.c +++ b/hw/dmx/dmxfont.c @@ -42,7 +42,7 @@ #include "dmxfont.h" #include "dmxlog.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfont.h" #include "dixstruct.h" diff --git a/hw/dmx/dmxfont.h b/hw/dmx/dmxfont.h index 9912db65c..f69aac196 100644 --- a/hw/dmx/dmxfont.h +++ b/hw/dmx/dmxfont.h @@ -38,7 +38,7 @@ #ifndef DMXFONT_H #define DMXFONT_H -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> /** Font private area. */ typedef struct _dmxFontPriv { diff --git a/hw/xfree86/common/atKeynames.h b/hw/xfree86/common/atKeynames.h index d37f5b0f0..8b3e303d7 100644 --- a/hw/xfree86/common/atKeynames.h +++ b/hw/xfree86/common/atKeynames.h @@ -50,6 +50,10 @@ /* $XConsortium: atKeynames.h /main/11 1996/03/09 11:17:41 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _ATKEYNAMES_H #define _ATKEYNAMES_H diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index b7d813329..86f237675 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -50,6 +50,10 @@ /* $XConsortium: compiler.h /main/16 1996/10/25 15:38:34 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _COMPILER_H # if !defined(_XF86_ANSIC_H) && defined(XFree86Module) diff --git a/hw/xfree86/common/fourcc.h b/hw/xfree86/common/fourcc.h index e60aa4e83..164678ec2 100644 --- a/hw/xfree86/common/fourcc.h +++ b/hw/xfree86/common/fourcc.h @@ -34,6 +34,10 @@ For an explanation of fourcc <-> guid mappings see RFC2361. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86_FOURCC_H_ #define _XF86_FOURCC_H_ 1 diff --git a/hw/xfree86/common/scoasm.h b/hw/xfree86/common/scoasm.h index dbf8c8f86..a8baea6c2 100644 --- a/hw/xfree86/common/scoasm.h +++ b/hw/xfree86/common/scoasm.h @@ -31,6 +31,10 @@ * scoasm.h - used to define inline versions of certain functions which * do NOT appear in sys/inline.h. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef SCO325 #ifndef _SCOASM_HDR_INC #define _SCOASM_HDR_INC diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index 1885eaa72..8d74fc808 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -34,6 +34,10 @@ * "public" means available to video drivers. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86_H #define _XF86_H diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c index 5f4886724..28b6ca68e 100644 --- a/hw/xfree86/common/xf86AutoConfig.c +++ b/hw/xfree86/common/xf86AutoConfig.c @@ -33,6 +33,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86AutoConfig.c,v 1.2 2003/11/03 05:11:01 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86Parser.h" #include "xf86tokens.h" diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index 903f61c28..a4779d0d9 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -31,6 +31,10 @@ * This file contains the interfaces to the bus-specific code */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <ctype.h> #include <stdlib.h> #include <unistd.h> diff --git a/hw/xfree86/common/xf86Bus.h b/hw/xfree86/common/xf86Bus.h index fbeca7f9c..96da6e6a9 100644 --- a/hw/xfree86/common/xf86Bus.h +++ b/hw/xfree86/common/xf86Bus.h @@ -33,6 +33,10 @@ * video drivers must not include this file. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86_BUS_H #define _XF86_BUS_H diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 269923c29..af27d9531 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -46,6 +46,10 @@ * ... and others */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef XF86DRI #include <sys/types.h> #include <grp.h> diff --git a/hw/xfree86/common/xf86Config.h b/hw/xfree86/common/xf86Config.h index e54da3d09..77b25ed32 100644 --- a/hw/xfree86/common/xf86Config.h +++ b/hw/xfree86/common/xf86Config.h @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _xf86_config_h #define _xf86_config_h diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index d35f0c8d7..b77d53038 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -24,6 +24,10 @@ * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <ctype.h> #include <stdlib.h> #include <unistd.h> diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c index f5f969060..0e2d77492 100644 --- a/hw/xfree86/common/xf86Cursor.c +++ b/hw/xfree86/common/xf86Cursor.c @@ -29,6 +29,10 @@ /* $XConsortium: xf86Cursor.c /main/10 1996/10/19 17:58:23 kaleb $ */ #define NEED_EVENTS +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "input.h" diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index 3d9bdfe22..4e47f2eee 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -29,6 +29,10 @@ * Written by Mark Vojkovich */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86str.h" #include "xf86Priv.h" diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c index 50a3e66d2..535c7e8fa 100644 --- a/hw/xfree86/common/xf86DPMS.c +++ b/hw/xfree86/common/xf86DPMS.c @@ -32,6 +32,10 @@ * This file contains the DPMS functions required by the extension. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "globals.h" diff --git a/hw/xfree86/common/xf86Date.h b/hw/xfree86/common/xf86Date.h index 15aafb817..4b65d2c1f 100644 --- a/hw/xfree86/common/xf86Date.h +++ b/hw/xfree86/common/xf86Date.h @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef XF86_DATE #define XF86_DATE "18 December 2003" diff --git a/hw/xfree86/common/xf86Debug.c b/hw/xfree86/common/xf86Debug.c index 76b69d79b..a41d0dd75 100644 --- a/hw/xfree86/common/xf86Debug.c +++ b/hw/xfree86/common/xf86Debug.c @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef __UNIXOS2__ #define I_NEED_OS2_H #endif diff --git a/hw/xfree86/common/xf86DefModes.c b/hw/xfree86/common/xf86DefModes.c index 1d6d332ec..a39d0a212 100644 --- a/hw/xfree86/common/xf86DefModes.c +++ b/hw/xfree86/common/xf86DefModes.c @@ -9,6 +9,10 @@ * Author: Dirk Hohndel <hohndel@XFree86.Org> */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef __UNIXOS2__ #define I_NEED_OS2_H #endif diff --git a/hw/xfree86/common/xf86DoProbe.c b/hw/xfree86/common/xf86DoProbe.c index f34d19a32..3208e6da8 100644 --- a/hw/xfree86/common/xf86DoProbe.c +++ b/hw/xfree86/common/xf86DoProbe.c @@ -31,6 +31,10 @@ * Load the driver modules and call their probe functions. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <ctype.h> #include <stdlib.h> #include <X11/X.h> diff --git a/hw/xfree86/common/xf86DoScanPci.c b/hw/xfree86/common/xf86DoScanPci.c index fe07d2875..c9c8128b2 100644 --- a/hw/xfree86/common/xf86DoScanPci.c +++ b/hw/xfree86/common/xf86DoScanPci.c @@ -31,6 +31,10 @@ * Call the functions from the scanpci module. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <ctype.h> #include <stdlib.h> #include <X11/X.h> diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c index a40c91b0f..90beb5688 100644 --- a/hw/xfree86/common/xf86Events.c +++ b/hw/xfree86/common/xf86Events.c @@ -53,6 +53,10 @@ /* [JCH-96/01/21] Extended std reverse map to four buttons. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef __UNIXOS2__ #define I_NEED_OS2_H #endif diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c index 653b4433c..c6488d677 100644 --- a/hw/xfree86/common/xf86Globals.c +++ b/hw/xfree86/common/xf86Globals.c @@ -31,6 +31,10 @@ * This file contains all the XFree86 global variables. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "windowstr.h" diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 50466697b..04f0d0150 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -36,6 +36,10 @@ * different drivers. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "servermd.h" diff --git a/hw/xfree86/common/xf86InPriv.h b/hw/xfree86/common/xf86InPriv.h index 32e3c8e1d..4a02606d3 100644 --- a/hw/xfree86/common/xf86InPriv.h +++ b/hw/xfree86/common/xf86InPriv.h @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _xf86InPriv_h #define _xf86InPriv_h diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 5db7f1a36..d4f4dd486 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -32,6 +32,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdlib.h> #undef HAS_UTSNAME diff --git a/hw/xfree86/common/xf86Io.c b/hw/xfree86/common/xf86Io.c index 338e28297..606084d41 100644 --- a/hw/xfree86/common/xf86Io.c +++ b/hw/xfree86/common/xf86Io.c @@ -52,6 +52,10 @@ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Io.c,v 1.3 2005/04/20 12:25:21 daniels Exp $ */ #define NEED_EVENTS +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "inputstr.h" diff --git a/hw/xfree86/common/xf86Kbd.c b/hw/xfree86/common/xf86Kbd.c index e1bbe8388..85f9e3406 100644 --- a/hw/xfree86/common/xf86Kbd.c +++ b/hw/xfree86/common/xf86Kbd.c @@ -50,6 +50,10 @@ /* $XConsortium: xf86Kbd.c /main/10 1996/02/21 17:38:32 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef __UNIXOS2__ #define I_NEED_OS2_H #endif diff --git a/hw/xfree86/common/xf86KbdBSD.c b/hw/xfree86/common/xf86KbdBSD.c index 3c6c0eece..c1f6156e3 100644 --- a/hw/xfree86/common/xf86KbdBSD.c +++ b/hw/xfree86/common/xf86KbdBSD.c @@ -51,6 +51,10 @@ /* $XConsortium: xf86KbdBSD.c /main/6 1996/10/23 13:12:27 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "input.h" diff --git a/hw/xfree86/common/xf86KbdLnx.c b/hw/xfree86/common/xf86KbdLnx.c index f6e9200c9..81e9122e7 100644 --- a/hw/xfree86/common/xf86KbdLnx.c +++ b/hw/xfree86/common/xf86KbdLnx.c @@ -57,6 +57,10 @@ /* $XConsortium: xf86KbdLnx.c /main/7 1996/10/19 17:59:00 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "input.h" diff --git a/hw/xfree86/common/xf86KbdMach.c b/hw/xfree86/common/xf86KbdMach.c index 0dc4b6fca..89c23c24a 100644 --- a/hw/xfree86/common/xf86KbdMach.c +++ b/hw/xfree86/common/xf86KbdMach.c @@ -37,6 +37,10 @@ */ /* $XConsortium: xf86KbdMach.c /main/9 1996/02/21 17:38:43 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "input.h" diff --git a/hw/xfree86/common/xf86Keymap.h b/hw/xfree86/common/xf86Keymap.h index 82ea52eef..f0998ba9b 100644 --- a/hw/xfree86/common/xf86Keymap.h +++ b/hw/xfree86/common/xf86Keymap.h @@ -36,6 +36,10 @@ static KeySym map[NUM_KEYCODES * GLYPHS_PER_KEY] = { +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #if !defined(__SOL8__) && (!defined(sun) || defined(i386)) /* 0x00 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol, diff --git a/hw/xfree86/common/xf86MiscExt.c b/hw/xfree86/common/xf86MiscExt.c index d59bea0c8..75a1d71fc 100644 --- a/hw/xfree86/common/xf86MiscExt.c +++ b/hw/xfree86/common/xf86MiscExt.c @@ -31,6 +31,10 @@ * XFree86-Misc extension. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef __UNIXOS2__ #define I_NEED_OS2_H #endif diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c index 6209290df..0211e3ced 100644 --- a/hw/xfree86/common/xf86Mode.c +++ b/hw/xfree86/common/xf86Mode.c @@ -36,6 +36,10 @@ * This file includes helper functions for mode related things. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "servermd.h" diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h index 7f4179cc3..7e11e776f 100644 --- a/hw/xfree86/common/xf86Module.h +++ b/hw/xfree86/common/xf86Module.h @@ -40,6 +40,10 @@ * XXX This file arguably belongs in xfree86/loader/. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86MODULE_H #define _XF86MODULE_H diff --git a/hw/xfree86/common/xf86Opt.h b/hw/xfree86/common/xf86Opt.h index 718732353..d207ec0a9 100644 --- a/hw/xfree86/common/xf86Opt.h +++ b/hw/xfree86/common/xf86Opt.h @@ -29,6 +29,10 @@ /* Option handling things that ModuleSetup procs can use */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86_OPT_H_ #define _XF86_OPT_H_ diff --git a/hw/xfree86/common/xf86Option.c b/hw/xfree86/common/xf86Option.c index ae131aa7c..695d97707 100644 --- a/hw/xfree86/common/xf86Option.c +++ b/hw/xfree86/common/xf86Option.c @@ -32,6 +32,10 @@ * This file includes public option handling functions. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdlib.h> #include <ctype.h> #include <X11/X.h> diff --git a/hw/xfree86/common/xf86PM.c b/hw/xfree86/common/xf86PM.c index a307bebb0..0262be3df 100644 --- a/hw/xfree86/common/xf86PM.c +++ b/hw/xfree86/common/xf86PM.c @@ -26,6 +26,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/common/xf86PciInfo.h b/hw/xfree86/common/xf86PciInfo.h index ab8836bd6..12cf3dd62 100644 --- a/hw/xfree86/common/xf86PciInfo.h +++ b/hw/xfree86/common/xf86PciInfo.h @@ -47,6 +47,10 @@ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86_PCIINFO_H #define _XF86_PCIINFO_H diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h index 8b0a4323b..01257fd9b 100644 --- a/hw/xfree86/common/xf86Priv.h +++ b/hw/xfree86/common/xf86Priv.h @@ -34,6 +34,10 @@ * "private" means not available to video drivers. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86PRIV_H #define _XF86PRIV_H diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h index 93d64fd51..cbec1ade7 100644 --- a/hw/xfree86/common/xf86Privstr.h +++ b/hw/xfree86/common/xf86Privstr.h @@ -32,6 +32,10 @@ * None of the data structures here should be used by video drivers. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86PRIVSTR_H #define _XF86PRIVSTR_H diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c index 7c77777e4..a020e97b2 100644 --- a/hw/xfree86/common/xf86RandR.c +++ b/hw/xfree86/common/xf86RandR.c @@ -23,6 +23,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "mibank.h" diff --git a/hw/xfree86/common/xf86Resources.h b/hw/xfree86/common/xf86Resources.h index ce2c62bb3..6ba347f34 100644 --- a/hw/xfree86/common/xf86Resources.h +++ b/hw/xfree86/common/xf86Resources.h @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86_RESOURCES_H #define _XF86_RESOURCES_H diff --git a/hw/xfree86/common/xf86Version.h b/hw/xfree86/common/xf86Version.h index 45746bc90..f0652fcb0 100644 --- a/hw/xfree86/common/xf86Version.h +++ b/hw/xfree86/common/xf86Version.h @@ -28,6 +28,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef XF86_VERSION_CURRENT #define XF86_VERSION_MAJOR 4 diff --git a/hw/xfree86/common/xf86Versions.c b/hw/xfree86/common/xf86Versions.c index 7b20ef9ab..6de7d53c2 100644 --- a/hw/xfree86/common/xf86Versions.c +++ b/hw/xfree86/common/xf86Versions.c @@ -26,6 +26,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86OSmouse.h" #include "xf86OSKbd.h" diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c index 1b2b63bbf..ec371f299 100644 --- a/hw/xfree86/common/xf86VidMode.c +++ b/hw/xfree86/common/xf86VidMode.c @@ -35,6 +35,10 @@ * maintained. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/common/xf86XKB.c b/hw/xfree86/common/xf86XKB.c index ab13ebd0f..68be17c3a 100644 --- a/hw/xfree86/common/xf86XKB.c +++ b/hw/xfree86/common/xf86XKB.c @@ -53,6 +53,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86XKB.c,v 3.12 2003/08/24 17:36:55 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdio.h> #define NEED_EVENTS 1 #include <X11/X.h> diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index e9f9fae3e..0d1f98844 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -50,6 +50,10 @@ /* $XConsortium: xf86Xinput.c /main/14 1996/10/27 11:05:25 kaleb $ */ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Xinput.c,v 1.4 2005/04/20 12:25:21 daniels Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/Xfuncproto.h> #include <X11/Xmd.h> #ifdef XINPUT diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h index 0c20f78fe..e45fd0f4d 100644 --- a/hw/xfree86/common/xf86Xinput.h +++ b/hw/xfree86/common/xf86Xinput.h @@ -51,6 +51,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Xinput.h,v 3.36 2003/08/24 17:36:55 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _xf86Xinput_h #define _xf86Xinput_h diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c index e27dceee9..019d84287 100644 --- a/hw/xfree86/common/xf86cmap.c +++ b/hw/xfree86/common/xf86cmap.c @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \ || (defined(sun) && defined(__SVR4)) #include <math.h> diff --git a/hw/xfree86/common/xf86cmap.h b/hw/xfree86/common/xf86cmap.h index 4291b971a..25e17e54c 100644 --- a/hw/xfree86/common/xf86cmap.h +++ b/hw/xfree86/common/xf86cmap.h @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86CMAP_H #define _XF86CMAP_H diff --git a/hw/xfree86/common/xf86fbBus.c b/hw/xfree86/common/xf86fbBus.c index 0d448e27b..bceca0dd8 100644 --- a/hw/xfree86/common/xf86fbBus.c +++ b/hw/xfree86/common/xf86fbBus.c @@ -31,6 +31,10 @@ * This file contains the interfaces to the bus-specific code */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <ctype.h> #include <stdlib.h> #include <unistd.h> diff --git a/hw/xfree86/common/xf86fbman.c b/hw/xfree86/common/xf86fbman.c index fef4d633c..3228c9bdf 100644 --- a/hw/xfree86/common/xf86fbman.c +++ b/hw/xfree86/common/xf86fbman.c @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" diff --git a/hw/xfree86/common/xf86fbman.h b/hw/xfree86/common/xf86fbman.h index adb26a1f1..3ea0248bf 100644 --- a/hw/xfree86/common/xf86fbman.h +++ b/hw/xfree86/common/xf86fbman.h @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86FBMAN_H #define _XF86FBMAN_H diff --git a/hw/xfree86/common/xf86isaBus.c b/hw/xfree86/common/xf86isaBus.c index 56a79ac23..97d5c3f53 100644 --- a/hw/xfree86/common/xf86isaBus.c +++ b/hw/xfree86/common/xf86isaBus.c @@ -31,6 +31,10 @@ * This file contains the interfaces to the bus-specific code */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <ctype.h> #include <stdlib.h> #include <unistd.h> diff --git a/hw/xfree86/common/xf86noBus.c b/hw/xfree86/common/xf86noBus.c index 904de01d6..70cdf1cc0 100644 --- a/hw/xfree86/common/xf86noBus.c +++ b/hw/xfree86/common/xf86noBus.c @@ -31,6 +31,10 @@ * This file contains the interfaces to the bus-specific code */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <ctype.h> #include <stdlib.h> #include <unistd.h> diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index da732e0a5..f01c7add8 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -31,6 +31,10 @@ */ #define INCLUDE_DEPRECATED 1 +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <ctype.h> #include <stdlib.h> #include <unistd.h> diff --git a/hw/xfree86/common/xf86pciBus.h b/hw/xfree86/common/xf86pciBus.h index fbb733ae7..75d82fbcf 100644 --- a/hw/xfree86/common/xf86pciBus.h +++ b/hw/xfree86/common/xf86pciBus.h @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86_PCI_BUS_H #define _XF86_PCI_BUS_H diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c index 5b747e248..ae4688737 100644 --- a/hw/xfree86/common/xf86sbusBus.c +++ b/hw/xfree86/common/xf86sbusBus.c @@ -22,6 +22,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c,v 3.6 2001/03/03 22:16:35 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <ctype.h> #include <stdio.h> #include <unistd.h> diff --git a/hw/xfree86/common/xf86sbusBus.h b/hw/xfree86/common/xf86sbusBus.h index 81c1b84ac..39688e569 100644 --- a/hw/xfree86/common/xf86sbusBus.h +++ b/hw/xfree86/common/xf86sbusBus.h @@ -22,6 +22,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.h,v 3.4 2001/10/28 03:33:19 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86_SBUSBUS_H #define _XF86_SBUSBUS_H diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h index 67052b220..186959708 100644 --- a/hw/xfree86/common/xf86str.h +++ b/hw/xfree86/common/xf86str.h @@ -32,6 +32,10 @@ * Any data structures that video drivers need to access should go here. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86STR_H #define _XF86STR_H diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c index 79cda35c5..0c8b39a70 100644 --- a/hw/xfree86/common/xf86xv.c +++ b/hw/xfree86/common/xf86xv.c @@ -30,6 +30,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xv.c,v 1.37 2003/11/10 18:22:15 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/common/xf86xv.h b/hw/xfree86/common/xf86xv.h index 316d6c9e5..258848b24 100644 --- a/hw/xfree86/common/xf86xv.h +++ b/hw/xfree86/common/xf86xv.h @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86XV_H_ #define _XF86XV_H_ diff --git a/hw/xfree86/common/xf86xvmc.c b/hw/xfree86/common/xf86xvmc.c index f6d0aaf39..bad2233e2 100644 --- a/hw/xfree86/common/xf86xvmc.c +++ b/hw/xfree86/common/xf86xvmc.c @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/common/xf86xvmc.h b/hw/xfree86/common/xf86xvmc.h index 0b073aac8..97eef7093 100644 --- a/hw/xfree86/common/xf86xvmc.h +++ b/hw/xfree86/common/xf86xvmc.h @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86XVMC_H #define _XF86XVMC_H diff --git a/hw/xfree86/common/xf86xvpriv.h b/hw/xfree86/common/xf86xvpriv.h index 0d1efdafb..7b0b5376d 100644 --- a/hw/xfree86/common/xf86xvpriv.h +++ b/hw/xfree86/common/xf86xvpriv.h @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86XVPRIV_H_ #define _XF86XVPRIV_H_ diff --git a/hw/xfree86/common/xisb.c b/hw/xfree86/common/xisb.c index 33fedeb0f..4ffc3ede4 100644 --- a/hw/xfree86/common/xisb.c +++ b/hw/xfree86/common/xisb.c @@ -36,6 +36,10 @@ * Standard Headers ****************************************************************************/ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef __UNIXOS2__ #define I_NEED_OS2_H #endif diff --git a/hw/xfree86/common/xisb.h b/hw/xfree86/common/xisb.h index 39ae2ee11..1e917a138 100644 --- a/hw/xfree86/common/xisb.h +++ b/hw/xfree86/common/xisb.h @@ -26,6 +26,10 @@ */ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _xisb_H_ #define _xisb_H_ diff --git a/hw/xfree86/common/xorgHelper.c b/hw/xfree86/common/xorgHelper.c index af729a01f..3eed90a11 100644 --- a/hw/xfree86/common/xorgHelper.c +++ b/hw/xfree86/common/xorgHelper.c @@ -1,5 +1,9 @@ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xorgHelper.c,v 1.3 2005/04/20 12:25:21 daniels Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "servermd.h" diff --git a/hw/xfree86/common/xorgVersion.h b/hw/xfree86/common/xorgVersion.h index 47005320a..de7f6f6b2 100644 --- a/hw/xfree86/common/xorgVersion.h +++ b/hw/xfree86/common/xorgVersion.h @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef XORG_VERSION_H # define XORG_VERSION_H diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c index 577e8169a..a3d7068ec 100644 --- a/hw/xfree86/ddc/ddcProperty.c +++ b/hw/xfree86/ddc/ddcProperty.c @@ -5,6 +5,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/ddcProperty.c,v 1.9tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" /* #include "xf86_ansic.h" */ diff --git a/hw/xfree86/ddc/edid.c b/hw/xfree86/ddc/edid.c index b17363648..a6c05bfe2 100644 --- a/hw/xfree86/ddc/edid.c +++ b/hw/xfree86/ddc/edid.c @@ -7,6 +7,10 @@ * * Copyright 1998 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE> */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h index f7e7a76ba..a14b48284 100644 --- a/hw/xfree86/ddc/edid.h +++ b/hw/xfree86/ddc/edid.h @@ -10,6 +10,10 @@ * Copyright 1998 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE> */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _EDID_H_ #define _EDID_H_ diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c index a2437a4ba..36983f452 100644 --- a/hw/xfree86/ddc/interpret_edid.c +++ b/hw/xfree86/ddc/interpret_edid.c @@ -4,6 +4,10 @@ * * Copyright 1998 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE> */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ddc/interpret_vdif.c b/hw/xfree86/ddc/interpret_vdif.c index a499db1da..c21bac17a 100644 --- a/hw/xfree86/ddc/interpret_vdif.c +++ b/hw/xfree86/ddc/interpret_vdif.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_vdif.c,v 1.5 1999/12/03 19:17:26 eich Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/Xarch.h> #include "xf86DDC.h" #include "vdif.h" diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c index 391f220cd..e23256bcc 100644 --- a/hw/xfree86/ddc/print_edid.c +++ b/hw/xfree86/ddc/print_edid.c @@ -4,6 +4,10 @@ * * Copyright 1998 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE> */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ddc/print_vdif.c b/hw/xfree86/ddc/print_vdif.c index 8329e129a..6c890c210 100644 --- a/hw/xfree86/ddc/print_vdif.c +++ b/hw/xfree86/ddc/print_vdif.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c,v 1.4tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "vdif.h" #include <X11/misc.h> #include "xf86DDC.h" diff --git a/hw/xfree86/ddc/vdif.h b/hw/xfree86/ddc/vdif.h index 5c129aef0..002cebba8 100644 --- a/hw/xfree86/ddc/vdif.h +++ b/hw/xfree86/ddc/vdif.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/vdif.h,v 1.4tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _VDIF_H #define _VDIF_H diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c index 3490fd533..b323f6b22 100644 --- a/hw/xfree86/ddc/xf86DDC.c +++ b/hw/xfree86/ddc/xf86DDC.c @@ -4,6 +4,10 @@ * * Copyright 1998,1999 by Egbert Eich <Egbert.Eich@Physik.TU-Darmstadt.DE> */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ddc/xf86DDC.h b/hw/xfree86/ddc/xf86DDC.h index 3d94fd976..c6ded82a1 100644 --- a/hw/xfree86/ddc/xf86DDC.h +++ b/hw/xfree86/ddc/xf86DDC.h @@ -11,6 +11,10 @@ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef XF86_DDC_H # define XF86_DDC_H diff --git a/hw/xfree86/dixmods/GLcoremodule.c b/hw/xfree86/dixmods/GLcoremodule.c index 9369db1f2..666ce52ce 100644 --- a/hw/xfree86/dixmods/GLcoremodule.c +++ b/hw/xfree86/dixmods/GLcoremodule.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c,v 1.1 2002/02/25 00:45:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/mesa/src/GLcoremodule.c,v 1.5 2000/02/23 04:46:55 martin Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -32,6 +32,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "xf86Module.h" static MODULESETUPPROTO(GLcoreSetup); @@ -42,7 +46,7 @@ static XF86ModuleVersionInfo VersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_EXTENSION, ABI_EXTENSION_VERSION, diff --git a/hw/xfree86/dixmods/afbmodule.c b/hw/xfree86/dixmods/afbmodule.c index 7920aa9bd..74dca9a26 100644 --- a/hw/xfree86/dixmods/afbmodule.c +++ b/hw/xfree86/dixmods/afbmodule.c @@ -25,6 +25,14 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/dixmods/bitmapmod.c b/hw/xfree86/dixmods/bitmapmod.c index 5141fd80a..0ae9ff7ad 100644 --- a/hw/xfree86/dixmods/bitmapmod.c +++ b/hw/xfree86/dixmods/bitmapmod.c @@ -25,9 +25,13 @@ */ /* $XFree86: xc/lib/font/bitmap/module/bitmapmod.c,v 1.7 1999/01/26 05:53:47 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/Xdefs.h> -#include "fontmod.h" +#include <X11/fonts/fontmod.h> #include "xf86Module.h" static MODULESETUPPROTO(bitmapSetup); diff --git a/hw/xfree86/dixmods/cfb16module.c b/hw/xfree86/dixmods/cfb16module.c index ef5c79459..7dcf52625 100644 --- a/hw/xfree86/dixmods/cfb16module.c +++ b/hw/xfree86/dixmods/cfb16module.c @@ -25,6 +25,14 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/dixmods/cfb24module.c b/hw/xfree86/dixmods/cfb24module.c index e7e683ae0..c467db703 100644 --- a/hw/xfree86/dixmods/cfb24module.c +++ b/hw/xfree86/dixmods/cfb24module.c @@ -25,6 +25,14 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/dixmods/cfb32module.c b/hw/xfree86/dixmods/cfb32module.c index 2d75763b0..619586320 100644 --- a/hw/xfree86/dixmods/cfb32module.c +++ b/hw/xfree86/dixmods/cfb32module.c @@ -25,6 +25,14 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/dixmods/cfbmodule.c b/hw/xfree86/dixmods/cfbmodule.c index 142442adb..f2cd87e59 100644 --- a/hw/xfree86/dixmods/cfbmodule.c +++ b/hw/xfree86/dixmods/cfbmodule.c @@ -25,6 +25,14 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/dixmods/dbemodule.c b/hw/xfree86/dixmods/dbemodule.c index ff2b7ffbc..218b28cec 100644 --- a/hw/xfree86/dixmods/dbemodule.c +++ b/hw/xfree86/dixmods/dbemodule.c @@ -1,5 +1,13 @@ /* $XFree86: xc/programs/Xserver/dbe/dbemodule.c,v 1.6 1999/01/26 05:53:50 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "xf86Module.h" static MODULESETUPPROTO(dbeSetup); diff --git a/hw/xfree86/dixmods/extmod/dgaproc.h b/hw/xfree86/dixmods/extmod/dgaproc.h index eb9791098..06c55e009 100644 --- a/hw/xfree86/dixmods/extmod/dgaproc.h +++ b/hw/xfree86/dixmods/extmod/dgaproc.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/Xext/dgaproc.h,v 1.21 2000/06/30 19:06:54 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef __DGAPROC_H #define __DGAPROC_H diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c index b4e9a1e94..88d3f6c2e 100644 --- a/hw/xfree86/dixmods/extmod/modinit.c +++ b/hw/xfree86/dixmods/extmod/modinit.c @@ -23,6 +23,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef XFree86LOADER #include "xf86_ansic.h" diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h index cb58e7fb9..3e185e460 100644 --- a/hw/xfree86/dixmods/extmod/modinit.h +++ b/hw/xfree86/dixmods/extmod/modinit.h @@ -1,6 +1,10 @@ /* $XdotOrg: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.3 2005/04/20 12:25:13 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.1 2003/07/16 01:38:33 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef INITARGS #define INITARGS void #endif diff --git a/hw/xfree86/dixmods/extmod/vidmodeproc.h b/hw/xfree86/dixmods/extmod/vidmodeproc.h index 99bac9dac..918d1e4df 100644 --- a/hw/xfree86/dixmods/extmod/vidmodeproc.h +++ b/hw/xfree86/dixmods/extmod/vidmodeproc.h @@ -2,6 +2,10 @@ /* Prototypes for DGA functions that the DDX must provide */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _VIDMODEPROC_H_ #define _VIDMODEPROC_H_ diff --git a/hw/xfree86/dixmods/extmod/xf86dga.c b/hw/xfree86/dixmods/extmod/xf86dga.c index efa7d1b40..1fdead0bc 100644 --- a/hw/xfree86/dixmods/extmod/xf86dga.c +++ b/hw/xfree86/dixmods/extmod/xf86dga.c @@ -9,6 +9,10 @@ Copyright (c) 1995, 1996, 1999 XFree86 Inc #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c index 7224a5eee..990d71da2 100644 --- a/hw/xfree86/dixmods/extmod/xf86dga2.c +++ b/hw/xfree86/dixmods/extmod/xf86dga2.c @@ -8,6 +8,10 @@ #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/hw/xfree86/dixmods/extmod/xf86dgaext.h b/hw/xfree86/dixmods/extmod/xf86dgaext.h index a823e28f2..16fc4c8b2 100644 --- a/hw/xfree86/dixmods/extmod/xf86dgaext.h +++ b/hw/xfree86/dixmods/extmod/xf86dgaext.h @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _XF86DGAEXT_H_ #define _XF86DGAEXT_H_ diff --git a/hw/xfree86/dixmods/extmod/xf86misc.c b/hw/xfree86/dixmods/extmod/xf86misc.c index e5ce56fc4..8c0f481b1 100644 --- a/hw/xfree86/dixmods/extmod/xf86misc.c +++ b/hw/xfree86/dixmods/extmod/xf86misc.c @@ -8,6 +8,10 @@ #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/hw/xfree86/dixmods/extmod/xf86miscproc.h b/hw/xfree86/dixmods/extmod/xf86miscproc.h index 3dab4277a..87a251767 100644 --- a/hw/xfree86/dixmods/extmod/xf86miscproc.h +++ b/hw/xfree86/dixmods/extmod/xf86miscproc.h @@ -2,6 +2,10 @@ /* Prototypes for Pointer/Keyboard functions that the DDX must provide */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _XF86MISCPROC_H_ #define _XF86MISCPROC_H_ diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c index 99de107c4..005c96102 100644 --- a/hw/xfree86/dixmods/extmod/xf86vmode.c +++ b/hw/xfree86/dixmods/extmod/xf86vmode.c @@ -35,6 +35,10 @@ from Kaleb S. KEITHLEY #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/hw/xfree86/dixmods/extmod/xvmod.c b/hw/xfree86/dixmods/extmod/xvmod.c index 0ffca8397..9f15129c3 100644 --- a/hw/xfree86/dixmods/extmod/xvmod.c +++ b/hw/xfree86/dixmods/extmod/xvmod.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/Xext/xvmod.c,v 1.1 1998/08/13 14:45:36 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "scrnintstr.h" diff --git a/hw/xfree86/dixmods/extmod/xvmodproc.h b/hw/xfree86/dixmods/extmod/xvmodproc.h index e08aef7f9..b284e3f4e 100644 --- a/hw/xfree86/dixmods/extmod/xvmodproc.h +++ b/hw/xfree86/dixmods/extmod/xvmodproc.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/Xext/xvmodproc.h,v 1.2 2001/03/05 04:51:55 mvojkovi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "xvmcext.h" extern int (*XvGetScreenIndexProc)(void); diff --git a/hw/xfree86/dixmods/fbmodule.c b/hw/xfree86/dixmods/fbmodule.c index 1b9b665dd..50cce798c 100644 --- a/hw/xfree86/dixmods/fbmodule.c +++ b/hw/xfree86/dixmods/fbmodule.c @@ -25,6 +25,14 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbmodule.c,v 1.3 2000/02/14 19:20:29 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/dixmods/ftmodule.c b/hw/xfree86/dixmods/ftmodule.c index 1f65cefbe..27b2bd2c3 100644 --- a/hw/xfree86/dixmods/ftmodule.c +++ b/hw/xfree86/dixmods/ftmodule.c @@ -27,7 +27,7 @@ #include "misc.h" -#include "fontmod.h" +#include <X11/fonts/fontmod.h> #include "xf86Module.h" static MODULESETUPPROTO(freetypeSetup); diff --git a/hw/xfree86/dixmods/laymodule.c b/hw/xfree86/dixmods/laymodule.c index 49fa254cc..5bcd101aa 100644 --- a/hw/xfree86/dixmods/laymodule.c +++ b/hw/xfree86/dixmods/laymodule.c @@ -22,15 +22,23 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mi.h" #include "regionstr.h" #include "globals.h" diff --git a/hw/xfree86/dixmods/mfbmodule.c b/hw/xfree86/dixmods/mfbmodule.c index 40d884c9e..dc9fddc5b 100644 --- a/hw/xfree86/dixmods/mfbmodule.c +++ b/hw/xfree86/dixmods/mfbmodule.c @@ -25,6 +25,14 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/dixmods/recordmod.c b/hw/xfree86/dixmods/recordmod.c index 4eebf0ee6..2825555c2 100644 --- a/hw/xfree86/dixmods/recordmod.c +++ b/hw/xfree86/dixmods/recordmod.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/record/recordmod.c,v 1.5 1999/01/26 05:54:21 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "xf86Module.h" extern Bool noTestExtensions; diff --git a/hw/xfree86/dixmods/shmodule.c b/hw/xfree86/dixmods/shmodule.c index 28f971a62..16ba6f2ce 100644 --- a/hw/xfree86/dixmods/shmodule.c +++ b/hw/xfree86/dixmods/shmodule.c @@ -22,15 +22,23 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mi.h" #include "regionstr.h" #include "globals.h" diff --git a/hw/xfree86/dixmods/type1mod.c b/hw/xfree86/dixmods/type1mod.c index 868de3de4..3e8547b50 100644 --- a/hw/xfree86/dixmods/type1mod.c +++ b/hw/xfree86/dixmods/type1mod.c @@ -27,7 +27,7 @@ #include "misc.h" -#include "fontmod.h" +#include <X11/fonts/fontmod.h> #include "xf86Module.h" static MODULESETUPPROTO(type1Setup); diff --git a/hw/xfree86/dixmods/xf86XTrapModule.c b/hw/xfree86/dixmods/xf86XTrapModule.c index f6e37b54e..1783d577a 100644 --- a/hw/xfree86/dixmods/xf86XTrapModule.c +++ b/hw/xfree86/dixmods/xf86XTrapModule.c @@ -2,6 +2,10 @@ /* This is the xf86 module code for the DEC_XTRAP extension. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "xf86Module.h" #include <X11/extensions/xtrapdi.h> diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index 094703bc0..7308b3d0e 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -34,6 +34,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "xf86.h" #ifdef XFree86LOADER #include "xf86_ansic.h" diff --git a/hw/xfree86/dri/dri.h b/hw/xfree86/dri/dri.h index bfb0d64a8..52acad959 100644 --- a/hw/xfree86/dri/dri.h +++ b/hw/xfree86/dri/dri.h @@ -34,6 +34,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. /* Prototypes for DRI functions */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _DRI_H_ #include "scrnintstr.h" diff --git a/hw/xfree86/dri/drimodule.c b/hw/xfree86/dri/drimodule.c index 1fa7a8edc..446ba6431 100644 --- a/hw/xfree86/dri/drimodule.c +++ b/hw/xfree86/dri/drimodule.c @@ -34,6 +34,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "xf86Module.h" static MODULESETUPPROTO(driSetup); diff --git a/hw/xfree86/dri/dristruct.h b/hw/xfree86/dri/dristruct.h index cf1b1eacf..47335ed04 100644 --- a/hw/xfree86/dri/dristruct.h +++ b/hw/xfree86/dri/dristruct.h @@ -32,6 +32,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef DRI_STRUCT_H #define DRI_STRUCT_H diff --git a/hw/xfree86/dri/sarea.h b/hw/xfree86/dri/sarea.h index 77c16e0ef..dd33c87a4 100644 --- a/hw/xfree86/dri/sarea.h +++ b/hw/xfree86/dri/sarea.h @@ -36,6 +36,10 @@ /* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.11 2002/10/30 12:52:03 alanh Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _SAREA_H_ #define _SAREA_H_ diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c index 3df025b0a..4a58b6c9e 100644 --- a/hw/xfree86/dri/xf86dri.c +++ b/hw/xfree86/dri/xf86dri.c @@ -35,6 +35,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "xf86.h" #ifdef XFree86LOADER #include "xf86_ansic.h" diff --git a/hw/xfree86/dummylib/dummylib.h b/hw/xfree86/dummylib/dummylib.h index 5835446bf..ca27e43d1 100644 --- a/hw/xfree86/dummylib/dummylib.h +++ b/hw/xfree86/dummylib/dummylib.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/dummylib.h,v 1.1 2000/02/13 03:06:38 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _DUMMY_LIB_H #define _DUMMY_LIB_H diff --git a/hw/xfree86/dummylib/fatalerror.c b/hw/xfree86/dummylib/fatalerror.c index e754a2013..7677fc055 100644 --- a/hw/xfree86/dummylib/fatalerror.c +++ b/hw/xfree86/dummylib/fatalerror.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/getvalidbios.c b/hw/xfree86/dummylib/getvalidbios.c index 862f85b4e..4a578ca46 100644 --- a/hw/xfree86/dummylib/getvalidbios.c +++ b/hw/xfree86/dummylib/getvalidbios.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/getvalidbios.c,v 1.1 2000/02/13 03:06:38 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/logvwrite.c b/hw/xfree86/dummylib/logvwrite.c index 0ff83881b..fc560f10f 100644 --- a/hw/xfree86/dummylib/logvwrite.c +++ b/hw/xfree86/dummylib/logvwrite.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/verrorfverb.c,v 1.2 2003/08/25 04:13:05 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/pcitestmulti.c b/hw/xfree86/dummylib/pcitestmulti.c index 59424f20f..80804627e 100644 --- a/hw/xfree86/dummylib/pcitestmulti.c +++ b/hw/xfree86/dummylib/pcitestmulti.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/verrorf.c b/hw/xfree86/dummylib/verrorf.c index 90283ccb3..5deb56d70 100644 --- a/hw/xfree86/dummylib/verrorf.c +++ b/hw/xfree86/dummylib/verrorf.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xalloc.c b/hw/xfree86/dummylib/xalloc.c index 383fa08a0..4676a93cf 100644 --- a/hw/xfree86/dummylib/xalloc.c +++ b/hw/xfree86/dummylib/xalloc.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xalloc.c,v 1.1 2000/02/13 03:06:39 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86addrestolist.c b/hw/xfree86/dummylib/xf86addrestolist.c index 006a6382a..fe21d5cab 100644 --- a/hw/xfree86/dummylib/xf86addrestolist.c +++ b/hw/xfree86/dummylib/xf86addrestolist.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86addrestolist.c,v 1.2tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" resPtr diff --git a/hw/xfree86/dummylib/xf86allocscripi.c b/hw/xfree86/dummylib/xf86allocscripi.c index 934f016df..05a9cca06 100644 --- a/hw/xfree86/dummylib/xf86allocscripi.c +++ b/hw/xfree86/dummylib/xf86allocscripi.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86drvmsg.c b/hw/xfree86/dummylib/xf86drvmsg.c index 090827a05..4cd9de04c 100644 --- a/hw/xfree86/dummylib/xf86drvmsg.c +++ b/hw/xfree86/dummylib/xf86drvmsg.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsg.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86drvmsgverb.c b/hw/xfree86/dummylib/xf86drvmsgverb.c index 8089a46da..2dcc2eccb 100644 --- a/hw/xfree86/dummylib/xf86drvmsgverb.c +++ b/hw/xfree86/dummylib/xf86drvmsgverb.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsgverb.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86errorf.c b/hw/xfree86/dummylib/xf86errorf.c index 9fbe347e6..9fa9e803f 100644 --- a/hw/xfree86/dummylib/xf86errorf.c +++ b/hw/xfree86/dummylib/xf86errorf.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c,v 1.2 2000/05/31 07:15:05 eich Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86errorfverb.c b/hw/xfree86/dummylib/xf86errorfverb.c index 3dc3264c3..3a06b02d1 100644 --- a/hw/xfree86/dummylib/xf86errorfverb.c +++ b/hw/xfree86/dummylib/xf86errorfverb.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorfverb.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86getpagesize.c b/hw/xfree86/dummylib/xf86getpagesize.c index b417d3007..f9454cb73 100644 --- a/hw/xfree86/dummylib/xf86getpagesize.c +++ b/hw/xfree86/dummylib/xf86getpagesize.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86getverb.c b/hw/xfree86/dummylib/xf86getverb.c index 8a48b5245..50d423d22 100644 --- a/hw/xfree86/dummylib/xf86getverb.c +++ b/hw/xfree86/dummylib/xf86getverb.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86info.c b/hw/xfree86/dummylib/xf86info.c index 9d0f6ecd7..61c1fe4d6 100644 --- a/hw/xfree86/dummylib/xf86info.c +++ b/hw/xfree86/dummylib/xf86info.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86msg.c b/hw/xfree86/dummylib/xf86msg.c index 6a0e38239..192d29dec 100644 --- a/hw/xfree86/dummylib/xf86msg.c +++ b/hw/xfree86/dummylib/xf86msg.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msg.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86msgverb.c b/hw/xfree86/dummylib/xf86msgverb.c index 9296cc72f..300311c89 100644 --- a/hw/xfree86/dummylib/xf86msgverb.c +++ b/hw/xfree86/dummylib/xf86msgverb.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msgverb.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86opt.c b/hw/xfree86/dummylib/xf86opt.c index 349443c9c..9a24455f4 100644 --- a/hw/xfree86/dummylib/xf86opt.c +++ b/hw/xfree86/dummylib/xf86opt.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86opt.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86screens.c b/hw/xfree86/dummylib/xf86screens.c index 0530e3b7a..d5a11ce65 100644 --- a/hw/xfree86/dummylib/xf86screens.c +++ b/hw/xfree86/dummylib/xf86screens.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86servisinit.c b/hw/xfree86/dummylib/xf86servisinit.c index 148b8fb7e..017f0b37e 100644 --- a/hw/xfree86/dummylib/xf86servisinit.c +++ b/hw/xfree86/dummylib/xf86servisinit.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/dummylib/xf86verbose.c b/hw/xfree86/dummylib/xf86verbose.c index 297606fc5..f6c5ed36e 100644 --- a/hw/xfree86/dummylib/xf86verbose.c +++ b/hw/xfree86/dummylib/xf86verbose.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/exa/exa.c b/hw/xfree86/exa/exa.c index 73f1d932d..e2ef7a0e5 100644 --- a/hw/xfree86/exa/exa.c +++ b/hw/xfree86/exa/exa.c @@ -26,7 +26,7 @@ #include <config.h> #endif #include "exaPriv.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "xf86str.h" #include "xf86.h" diff --git a/hw/xfree86/exa/exa_accel.c b/hw/xfree86/exa/exa_accel.c index 73f1d932d..e2ef7a0e5 100644 --- a/hw/xfree86/exa/exa_accel.c +++ b/hw/xfree86/exa/exa_accel.c @@ -26,7 +26,7 @@ #include <config.h> #endif #include "exaPriv.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "xf86str.h" #include "xf86.h" diff --git a/hw/xfree86/exa/exa_migration.c b/hw/xfree86/exa/exa_migration.c index 73f1d932d..e2ef7a0e5 100644 --- a/hw/xfree86/exa/exa_migration.c +++ b/hw/xfree86/exa/exa_migration.c @@ -26,7 +26,7 @@ #include <config.h> #endif #include "exaPriv.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "xf86str.h" #include "xf86.h" diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c index 79ace00e1..8c4c51dec 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.c +++ b/hw/xfree86/fbdevhw/fbdevhw.c @@ -1,6 +1,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c,v 1.32 2003/08/26 10:57:03 daenzer Exp $ */ /* all driver need this */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/fbdevhw/fbdevhw.h b/hw/xfree86/fbdevhw/fbdevhw.h index cfc3fcdb6..584ad4db2 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.h +++ b/hw/xfree86/fbdevhw/fbdevhw.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.h,v 1.11 2001/10/01 13:44:12 eich Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _FBDEVHW_H_ #define _FBDEVHW_H_ diff --git a/hw/xfree86/fbdevhw/fbdevhwstub.c b/hw/xfree86/fbdevhw/fbdevhwstub.c index 7869bb31d..80bccc8db 100644 --- a/hw/xfree86/fbdevhw/fbdevhwstub.c +++ b/hw/xfree86/fbdevhw/fbdevhwstub.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c,v 1.12 2001/10/28 03:33:55 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86cmap.h" #include "fbdevhw.h" diff --git a/hw/xfree86/fbdevhw/fbpriv.h b/hw/xfree86/fbdevhw/fbpriv.h index f4017fb2a..a18b84345 100644 --- a/hw/xfree86/fbdevhw/fbpriv.h +++ b/hw/xfree86/fbdevhw/fbpriv.h @@ -4,6 +4,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbpriv.h,v 1.2 2000/01/21 02:30:02 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _LINUX_FB_H #define _LINUX_FB_H diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c index 4253d8075..321c1e2e1 100644 --- a/hw/xfree86/i2c/xf86i2c.c +++ b/hw/xfree86/i2c/xf86i2c.c @@ -8,6 +8,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c,v 1.14 2003/05/05 21:18:41 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #if 1 #include <X11/misc.h> #include "xf86.h" diff --git a/hw/xfree86/i2c/xf86i2c.h b/hw/xfree86/i2c/xf86i2c.h index 099406e8f..035d49a51 100644 --- a/hw/xfree86/i2c/xf86i2c.h +++ b/hw/xfree86/i2c/xf86i2c.h @@ -3,6 +3,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h,v 1.10 2003/07/16 01:38:47 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86I2C_H #define _XF86I2C_H diff --git a/hw/xfree86/i2c/xf86i2cmodule.c b/hw/xfree86/i2c/xf86i2cmodule.c index 0058795f0..7569af30e 100644 --- a/hw/xfree86/i2c/xf86i2cmodule.c +++ b/hw/xfree86/i2c/xf86i2cmodule.c @@ -7,6 +7,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2cmodule.c,v 1.6 1999/01/26 05:54:10 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Module.h" static MODULESETUPPROTO(i2cSetup); diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c index 01bb4c30a..e9ddd3334 100644 --- a/hw/xfree86/int10/generic.c +++ b/hw/xfree86/int10/generic.c @@ -4,6 +4,10 @@ * execute BIOS int 10h calls in x86 real mode environment * Copyright 1999 Egbert Eich */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c index c3d47da2b..a9538f6e4 100644 --- a/hw/xfree86/int10/helper_exec.c +++ b/hw/xfree86/int10/helper_exec.c @@ -15,6 +15,10 @@ * on PIO. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/int10/helper_mem.c b/hw/xfree86/int10/helper_mem.c index c0433773d..495a0e04d 100644 --- a/hw/xfree86/int10/helper_mem.c +++ b/hw/xfree86/int10/helper_mem.c @@ -4,6 +4,10 @@ * execute BIOS int 10h calls in x86 real mode environment * Copyright 1999 Egbert Eich */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/int10/pci.c b/hw/xfree86/int10/pci.c index 7c95171d4..f35bd7233 100644 --- a/hw/xfree86/int10/pci.c +++ b/hw/xfree86/int10/pci.c @@ -5,6 +5,10 @@ * execute BIOS int 10h calls in x86 real mode environment * Copyright 1999 Egbert Eich */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Pci.h" #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/int10/stub.c b/hw/xfree86/int10/stub.c index c54de2461..35b74cd42 100644 --- a/hw/xfree86/int10/stub.c +++ b/hw/xfree86/int10/stub.c @@ -4,6 +4,10 @@ * execute BIOS int 10h calls in x86 real mode environment * Copyright 1999 Egbert Eich */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86str.h" #include "xf86_OSproc.h" diff --git a/hw/xfree86/int10/x86emu.c b/hw/xfree86/int10/x86emu.c index 2d0faa603..b9580a1de 100644 --- a/hw/xfree86/int10/x86emu.c +++ b/hw/xfree86/int10/x86emu.c @@ -1,4 +1,8 @@ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef NO_SYS_HEADERS # include "xf86_ansic.h" #endif diff --git a/hw/xfree86/int10/xf86int10.c b/hw/xfree86/int10/xf86int10.c index e88c6500d..06cf40b8c 100644 --- a/hw/xfree86/int10/xf86int10.c +++ b/hw/xfree86/int10/xf86int10.c @@ -5,6 +5,10 @@ * Copyright 1999 Egbert Eich */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_ansic.h" #include "compiler.h" diff --git a/hw/xfree86/int10/xf86int10.h b/hw/xfree86/int10/xf86int10.h index 9e137df41..d88221a89 100644 --- a/hw/xfree86/int10/xf86int10.h +++ b/hw/xfree86/int10/xf86int10.h @@ -6,6 +6,10 @@ * Copyright 1999 Egbert Eich */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86INT10_H #define _XF86INT10_H diff --git a/hw/xfree86/int10/xf86int10module.c b/hw/xfree86/int10/xf86int10module.c index 2bb49cb0c..391c18374 100644 --- a/hw/xfree86/int10/xf86int10module.c +++ b/hw/xfree86/int10/xf86int10module.c @@ -4,6 +4,10 @@ * execute BIOS int 10h calls in x86 real mode environment * Copyright 1999 Egbert Eich */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86str.h" #include "xf86Pci.h" diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c index ffee4fb9a..c15a5f9be 100644 --- a/hw/xfree86/int10/xf86x86emu.c +++ b/hw/xfree86/int10/xf86x86emu.c @@ -4,6 +4,10 @@ * execute BIOS int 10h calls in x86 real mode environment * Copyright 1999 Egbert Eich */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <x86emu.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/int10/xf86x86emu.h b/hw/xfree86/int10/xf86x86emu.h index 27ff6fc14..a7eb6d3c7 100644 --- a/hw/xfree86/int10/xf86x86emu.h +++ b/hw/xfree86/int10/xf86x86emu.h @@ -4,6 +4,10 @@ * execute BIOS int 10h calls in x86 real mode environment * Copyright 1999 Egbert Eich */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef XF86X86EMU_H_ #define XF86X86EMU_H_ #include <x86emu.h> diff --git a/hw/xfree86/loader/aout.h b/hw/xfree86/loader/aout.h index 3f60f37d7..6b8247119 100644 --- a/hw/xfree86/loader/aout.h +++ b/hw/xfree86/loader/aout.h @@ -32,6 +32,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _AOUT_H #define _AOUT_H diff --git a/hw/xfree86/loader/aoutloader.c b/hw/xfree86/loader/aoutloader.c index a79375abc..a000862ae 100644 --- a/hw/xfree86/loader/aoutloader.c +++ b/hw/xfree86/loader/aoutloader.c @@ -25,6 +25,10 @@ * * Modified 21/02/97 by Sebastien Marineau to support OS/2 a.out objects */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <sys/types.h> #include <sys/stat.h> #include <stdio.h> diff --git a/hw/xfree86/loader/aoutloader.h b/hw/xfree86/loader/aoutloader.h index 7aeaf41fe..f906816f7 100644 --- a/hw/xfree86/loader/aoutloader.h +++ b/hw/xfree86/loader/aoutloader.h @@ -21,6 +21,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/aoutloader.h,v 1.3 1998/09/20 14:41:03 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _AOUTLOADER_H #define _AOUTLOADER_H extern void *AOUTLoadModule(loaderPtr, int, LOOKUP **); diff --git a/hw/xfree86/loader/ar.h b/hw/xfree86/loader/ar.h index 3129d1c72..c9ae558cf 100644 --- a/hw/xfree86/loader/ar.h +++ b/hw/xfree86/loader/ar.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/ar.h,v 1.3 1998/07/25 16:56:12 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _AR_H #define _AR_H diff --git a/hw/xfree86/loader/coff.h b/hw/xfree86/loader/coff.h index 54a8cb57f..b3cecdfbe 100644 --- a/hw/xfree86/loader/coff.h +++ b/hw/xfree86/loader/coff.h @@ -16,6 +16,10 @@ COFF, thein check out the book mentioned above. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _COFF_H #define _COFF_H diff --git a/hw/xfree86/loader/coffloader.c b/hw/xfree86/loader/coffloader.c index 366bf6eaf..32a229d2f 100644 --- a/hw/xfree86/loader/coffloader.c +++ b/hw/xfree86/loader/coffloader.c @@ -22,6 +22,10 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <sys/types.h> #include <unistd.h> #include <stdlib.h> diff --git a/hw/xfree86/loader/coffloader.h b/hw/xfree86/loader/coffloader.h index 3d6728481..75cd542c8 100644 --- a/hw/xfree86/loader/coffloader.h +++ b/hw/xfree86/loader/coffloader.h @@ -23,6 +23,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/coffloader.h,v 1.3 1998/09/20 14:41:04 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _COFFLOADER_H #define _COFFLOADER_H /* coffloader.c */ diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c index b1997cd40..4e57d2e15 100644 --- a/hw/xfree86/loader/dixsym.c +++ b/hw/xfree86/loader/dixsym.c @@ -51,6 +51,10 @@ */ #undef DBMALLOC +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "sym.h" #include "colormap.h" #include "cursor.h" diff --git a/hw/xfree86/loader/dlloader.c b/hw/xfree86/loader/dlloader.c index a089ba548..719b7b314 100644 --- a/hw/xfree86/loader/dlloader.c +++ b/hw/xfree86/loader/dlloader.c @@ -25,6 +25,10 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdio.h> #include <stdlib.h> #include <dlfcn.h> diff --git a/hw/xfree86/loader/dlloader.h b/hw/xfree86/loader/dlloader.h index 51f0520e6..1dfae274d 100644 --- a/hw/xfree86/loader/dlloader.h +++ b/hw/xfree86/loader/dlloader.h @@ -21,6 +21,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dlloader.h,v 1.2 1998/07/25 16:56:14 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _DLLOADER_H #define _DLLOADER_H extern void *DLLoadModule(loaderPtr, int, LOOKUP **); diff --git a/hw/xfree86/loader/elf.h b/hw/xfree86/loader/elf.h index 51322a9e7..c53796cb6 100644 --- a/hw/xfree86/loader/elf.h +++ b/hw/xfree86/loader/elf.h @@ -115,6 +115,10 @@ typedef struct dynamic64 { } d_un; } Elf64_Dyn; +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef QNX4 extern Elf32_Dyn _DYNAMIC[]; #endif diff --git a/hw/xfree86/loader/elfloader.c b/hw/xfree86/loader/elfloader.c index 173695006..0275aa037 100644 --- a/hw/xfree86/loader/elfloader.c +++ b/hw/xfree86/loader/elfloader.c @@ -23,6 +23,10 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <sys/types.h> #ifndef __UNIXOS2__ #include <sys/mman.h> diff --git a/hw/xfree86/loader/elfloader.h b/hw/xfree86/loader/elfloader.h index 0a42d7060..6e9f02ca4 100644 --- a/hw/xfree86/loader/elfloader.h +++ b/hw/xfree86/loader/elfloader.h @@ -23,6 +23,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.h,v 1.3 1998/09/20 14:41:05 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _ELFLOADER_H #define _ELFLOADER_H /* elfloader.c */ diff --git a/hw/xfree86/loader/extsym.c b/hw/xfree86/loader/extsym.c index f53da6e3a..0966466fd 100644 --- a/hw/xfree86/loader/extsym.c +++ b/hw/xfree86/loader/extsym.c @@ -25,6 +25,10 @@ * SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "resource.h" #include "sym.h" #include <X11/misc.h> diff --git a/hw/xfree86/loader/fontsym.c b/hw/xfree86/loader/fontsym.c index 1a1324fdb..5daf82802 100644 --- a/hw/xfree86/loader/fontsym.c +++ b/hw/xfree86/loader/fontsym.c @@ -26,17 +26,21 @@ * authorization from the copyright holder(s) and author(s). */ -#include "font.h" +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + +#include <X11/fonts/font.h> #include "sym.h" -#include "fntfilst.h" -#include "fontenc.h" +#include <X11/fonts/fntfilst.h> +#include <X11/fonts/fontenc.h> #ifdef FONTENC_COMPATIBILITY -#include "fontencc.h" +#include <X11/fonts/fontencc.h> #endif -#include "fntfilio.h" -#include "fntfil.h" -#include "fontutil.h" -#include "fontxlfd.h" +#include <X11/fonts/fntfilio.h> +#include <X11/fonts/fntfil.h> +#include <X11/fonts/fontutil.h> +#include <X11/fonts/fontxlfd.h> #ifdef FONTCACHE #define _FONTCACHE_SERVER_ #include "fontcache.h" diff --git a/hw/xfree86/loader/hash.c b/hw/xfree86/loader/hash.c index d424f0461..9cd4e6eb8 100644 --- a/hw/xfree86/loader/hash.c +++ b/hw/xfree86/loader/hash.c @@ -24,6 +24,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/os.h> #include <X11/Xos.h> #undef abs diff --git a/hw/xfree86/loader/hash.h b/hw/xfree86/loader/hash.h index 88b525669..45617bd5f 100644 --- a/hw/xfree86/loader/hash.h +++ b/hw/xfree86/loader/hash.h @@ -23,6 +23,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/hash.h,v 1.2.2.2 1998/07/04 13:32:45 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _HASH_H #define _HASH_H diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c index 4e4729526..471510a30 100644 --- a/hw/xfree86/loader/loader.c +++ b/hw/xfree86/loader/loader.c @@ -48,6 +48,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <errno.h> #include <stdio.h> #include <stdlib.h> diff --git a/hw/xfree86/loader/loader.h b/hw/xfree86/loader/loader.h index f48aadb02..307b9bb48 100644 --- a/hw/xfree86/loader/loader.h +++ b/hw/xfree86/loader/loader.h @@ -49,6 +49,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _LOADER_H #define _LOADER_H diff --git a/hw/xfree86/loader/loaderProcs.h b/hw/xfree86/loader/loaderProcs.h index d2779812f..72591a5df 100644 --- a/hw/xfree86/loader/loaderProcs.h +++ b/hw/xfree86/loader/loaderProcs.h @@ -49,12 +49,16 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _LOADERPROCS_H #define _LOADERPROCS_H #define IN_LOADER #include "xf86Module.h" -#include "fontmod.h" +#include <X11/fonts/fontmod.h> typedef struct module_desc { struct module_desc *child; diff --git a/hw/xfree86/loader/loadext.c b/hw/xfree86/loader/loadext.c index 705460eb9..fb0affeba 100644 --- a/hw/xfree86/loader/loadext.c +++ b/hw/xfree86/loader/loadext.c @@ -29,6 +29,10 @@ /* Maybe this file belongs elsewhere? */ #define LOADERDECLARATIONS +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "loaderProcs.h" #include <X11/misc.h> #include "xf86.h" diff --git a/hw/xfree86/loader/loadfont.c b/hw/xfree86/loader/loadfont.c index 69a16ac80..f9bbbfeb4 100644 --- a/hw/xfree86/loader/loadfont.c +++ b/hw/xfree86/loader/loadfont.c @@ -29,6 +29,10 @@ /* Maybe this file belongs in lib/font/fontfile/module/ ? */ #define LOADERDECLARATIONS +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "loaderProcs.h" #include <X11/misc.h> #include "xf86.h" diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c index b3c9f736b..48220719b 100644 --- a/hw/xfree86/loader/loadmod.c +++ b/hw/xfree86/loader/loadmod.c @@ -49,6 +49,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/os.h> /* For stat() and related stuff */ #define NO_OSLIB_PROTOTYPES diff --git a/hw/xfree86/loader/misym.c b/hw/xfree86/loader/misym.c index 5977546b8..29d6a2f89 100644 --- a/hw/xfree86/loader/misym.c +++ b/hw/xfree86/loader/misym.c @@ -51,6 +51,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "sym.h" #include <X11/misc.h> #include "mi.h" diff --git a/hw/xfree86/loader/os.c b/hw/xfree86/loader/os.c index 49f9c0d84..010730586 100644 --- a/hw/xfree86/loader/os.c +++ b/hw/xfree86/loader/os.c @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "loaderProcs.h" /* diff --git a/hw/xfree86/loader/sym.h b/hw/xfree86/loader/sym.h index 0e18959c3..5b34718d6 100644 --- a/hw/xfree86/loader/sym.h +++ b/hw/xfree86/loader/sym.h @@ -23,6 +23,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _SYM_H #define _SYM_H diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c index ee71f4ff8..de7e638bb 100644 --- a/hw/xfree86/loader/xf86sym.c +++ b/hw/xfree86/loader/xf86sym.c @@ -51,6 +51,10 @@ #define INCLUDE_DEPRECATED 1 +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <fcntl.h> #include <setjmp.h> #include "sym.h" diff --git a/hw/xfree86/os-support/assyntax.h b/hw/xfree86/os-support/assyntax.h index 191c7e49e..1cf84353b 100644 --- a/hw/xfree86/os-support/assyntax.h +++ b/hw/xfree86/os-support/assyntax.h @@ -1,4 +1,8 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/assyntax.h,v 3.13 2003/08/24 17:37:03 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef __ASSYNTAX_H__ #define __ASSYNTAX_H__ diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c index 5b7b35b40..0ed261061 100644 --- a/hw/xfree86/os-support/bsd/alpha_video.c +++ b/hw/xfree86/os-support/bsd/alpha_video.c @@ -26,6 +26,10 @@ /* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c index b52b85425..98fb8f993 100644 --- a/hw/xfree86/os-support/bsd/arm_video.c +++ b/hw/xfree86/os-support/bsd/arm_video.c @@ -59,6 +59,10 @@ /* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/bsd/bsdResource.c b/hw/xfree86/os-support/bsd/bsdResource.c index 5ac2e08b5..d38230a83 100644 --- a/hw/xfree86/os-support/bsd/bsdResource.c +++ b/hw/xfree86/os-support/bsd/bsdResource.c @@ -2,6 +2,10 @@ /* Resource information code */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/bsd/bsd_KbdMap.c b/hw/xfree86/os-support/bsd/bsd_KbdMap.c index fcff3d6e7..d225c1f38 100644 --- a/hw/xfree86/os-support/bsd/bsd_KbdMap.c +++ b/hw/xfree86/os-support/bsd/bsd_KbdMap.c @@ -8,6 +8,10 @@ * and from xf86KbdCODrv.c by Holger Veit */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "input.h" diff --git a/hw/xfree86/os-support/bsd/bsd_VTsw.c b/hw/xfree86/os-support/bsd/bsd_VTsw.c index 3c3170fe1..d97782dc6 100644 --- a/hw/xfree86/os-support/bsd/bsd_VTsw.c +++ b/hw/xfree86/os-support/bsd/bsd_VTsw.c @@ -25,6 +25,10 @@ */ /* $XConsortium: bsd_VTsw.c /main/4 1996/02/21 17:50:57 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/bsd/bsd_apm.c b/hw/xfree86/os-support/bsd/bsd_apm.c index ef442b4f7..3554edddc 100644 --- a/hw/xfree86/os-support/bsd/bsd_apm.c +++ b/hw/xfree86/os-support/bsd/bsd_apm.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/os-support/bsd/bsd_axp.c b/hw/xfree86/os-support/bsd/bsd_axp.c index 77a2a79a8..8328e5115 100644 --- a/hw/xfree86/os-support/bsd/bsd_axp.c +++ b/hw/xfree86/os-support/bsd/bsd_axp.c @@ -1,5 +1,9 @@ /* $XFree86: bsd_axp.c,v 1.2 2002/10/29 23:19:13 herrb Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/os-support/bsd/bsd_ev56.c b/hw/xfree86/os-support/bsd/bsd_ev56.c index a46c616da..62952a343 100644 --- a/hw/xfree86/os-support/bsd/bsd_ev56.c +++ b/hw/xfree86/os-support/bsd/bsd_ev56.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_ev56.c,v 1.1 2000/03/05 16:59:17 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "input.h" #include "scrnintstr.h" diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c index 02e7825b4..3cdea419b 100644 --- a/hw/xfree86/os-support/bsd/bsd_init.c +++ b/hw/xfree86/os-support/bsd/bsd_init.c @@ -25,6 +25,10 @@ */ /* $XConsortium: bsd_init.c /main/8 1996/10/23 13:13:05 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/bsd/bsd_io.c b/hw/xfree86/os-support/bsd/bsd_io.c index e44629f89..817749988 100644 --- a/hw/xfree86/os-support/bsd/bsd_io.c +++ b/hw/xfree86/os-support/bsd/bsd_io.c @@ -26,6 +26,10 @@ /* $XConsortium: bsd_io.c /main/11 1996/10/19 18:06:07 kaleb $ */ #define NEED_EVENTS +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/bsd/bsd_jstk.c b/hw/xfree86/os-support/bsd/bsd_jstk.c index 71bc91687..acd9fc111 100644 --- a/hw/xfree86/os-support/bsd/bsd_jstk.c +++ b/hw/xfree86/os-support/bsd/bsd_jstk.c @@ -25,6 +25,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c,v 3.7 1998/07/25 16:56:34 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <sys/types.h> #include <unistd.h> #include <string.h> diff --git a/hw/xfree86/os-support/bsd/bsd_kbd.c b/hw/xfree86/os-support/bsd/bsd_kbd.c index 4cf2fbaae..461646c4a 100644 --- a/hw/xfree86/os-support/bsd/bsd_kbd.c +++ b/hw/xfree86/os-support/bsd/bsd_kbd.c @@ -10,6 +10,10 @@ */ #define NEED_EVENTS +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/bsd/bsd_kmod.c b/hw/xfree86/os-support/bsd/bsd_kmod.c index 74345654b..ecaf78028 100644 --- a/hw/xfree86/os-support/bsd/bsd_kmod.c +++ b/hw/xfree86/os-support/bsd/bsd_kmod.c @@ -1,4 +1,8 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kmod.c,v 3.2 2002/11/29 17:47:24 tsi Exp $ */ +/* $XFree86$ */ + +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif #include <errno.h> #include <fcntl.h> diff --git a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c index 07cc55f54..06544eedf 100644 --- a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c +++ b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c @@ -28,6 +28,10 @@ */ /* $OpenBSD: bsd_kqueue_apm.c,v 1.5 2002/07/30 23:07:42 matthieu Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/os-support/bsd/bsd_mouse.c b/hw/xfree86/os-support/bsd/bsd_mouse.c index a830b60c0..daf48fbc0 100644 --- a/hw/xfree86/os-support/bsd/bsd_mouse.c +++ b/hw/xfree86/os-support/bsd/bsd_mouse.c @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c index 54b4c8848..1515d0e1e 100644 --- a/hw/xfree86/os-support/bsd/i386_video.c +++ b/hw/xfree86/os-support/bsd/i386_video.c @@ -26,6 +26,10 @@ /* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/bsd/libusb/data.c b/hw/xfree86/os-support/bsd/libusb/data.c index bb84e5566..0ac1a63bc 100644 --- a/hw/xfree86/os-support/bsd/libusb/data.c +++ b/hw/xfree86/os-support/bsd/libusb/data.c @@ -25,7 +25,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/data.c,v 1.1 2000/02/11 18:06:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/data.c,v 1.1.2.2 1999/12/03 10:12:41 hohndel Exp $ */ + +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif #include <assert.h> #include <stdlib.h> diff --git a/hw/xfree86/os-support/bsd/libusb/descr.c b/hw/xfree86/os-support/bsd/libusb/descr.c index f75418964..2306d2f58 100644 --- a/hw/xfree86/os-support/bsd/libusb/descr.c +++ b/hw/xfree86/os-support/bsd/libusb/descr.c @@ -25,7 +25,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/descr.c,v 1.1 2000/02/11 18:06:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/descr.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */ + +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif #include <sys/types.h> diff --git a/hw/xfree86/os-support/bsd/libusb/parse.c b/hw/xfree86/os-support/bsd/libusb/parse.c index 8c1a8b8a2..feff9779a 100644 --- a/hw/xfree86/os-support/bsd/libusb/parse.c +++ b/hw/xfree86/os-support/bsd/libusb/parse.c @@ -25,7 +25,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/parse.c,v 1.1 2000/02/11 18:06:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/parse.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */ + +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif #include <assert.h> #include <stdlib.h> diff --git a/hw/xfree86/os-support/bsd/libusb/usage.c b/hw/xfree86/os-support/bsd/libusb/usage.c index 9338e61d4..f909ee691 100644 --- a/hw/xfree86/os-support/bsd/libusb/usage.c +++ b/hw/xfree86/os-support/bsd/libusb/usage.c @@ -25,7 +25,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usage.c,v 1.1 2000/02/11 18:06:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/usage.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */ + +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif #include <ctype.h> #include <err.h> diff --git a/hw/xfree86/os-support/bsd/memrange.h b/hw/xfree86/os-support/bsd/memrange.h index 99be9ea2f..0f4b270f4 100644 --- a/hw/xfree86/os-support/bsd/memrange.h +++ b/hw/xfree86/os-support/bsd/memrange.h @@ -3,7 +3,11 @@ * * $FreeBSD: src/sys/sys/memrange.h,v 1.4 1999/12/29 04:24:44 peter Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/memrange.h,v 1.1 2002/08/06 13:25:36 herrb Exp $ */ +/* $XFree86$ */ + +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif #ifndef _MEMRANGE_H #define _MEMRANGE_H diff --git a/hw/xfree86/os-support/bsd/ppc_video.c b/hw/xfree86/os-support/bsd/ppc_video.c index e2550bf86..edcb20c1b 100644 --- a/hw/xfree86/os-support/bsd/ppc_video.c +++ b/hw/xfree86/os-support/bsd/ppc_video.c @@ -26,6 +26,10 @@ /* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/bsd/sparc64_video.c b/hw/xfree86/os-support/bsd/sparc64_video.c index f73c30182..d9dfcca31 100644 --- a/hw/xfree86/os-support/bsd/sparc64_video.c +++ b/hw/xfree86/os-support/bsd/sparc64_video.c @@ -27,6 +27,10 @@ /* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/bus/460gxPCI.c b/hw/xfree86/os-support/bus/460gxPCI.c index 9855b8b41..255dfa12f 100644 --- a/hw/xfree86/os-support/bus/460gxPCI.c +++ b/hw/xfree86/os-support/bus/460gxPCI.c @@ -29,6 +29,10 @@ * This file contains the glue necessary for support of Intel's 460GX chipset. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "460gxPCI.h" #include "xf86.h" #include "Pci.h" diff --git a/hw/xfree86/os-support/bus/460gxPCI.h b/hw/xfree86/os-support/bus/460gxPCI.h index 9459705d0..65a19b2f0 100644 --- a/hw/xfree86/os-support/bus/460gxPCI.h +++ b/hw/xfree86/os-support/bus/460gxPCI.h @@ -25,6 +25,10 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef PCI_460GX_H #define PCI_460GX_H 1 diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c index c1c08569e..d837ec92e 100644 --- a/hw/xfree86/os-support/bus/Pci.c +++ b/hw/xfree86/os-support/bus/Pci.c @@ -195,6 +195,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <errno.h> #include <signal.h> #include <X11/Xarch.h> diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h index 4a6ff672a..ee6e9d723 100644 --- a/hw/xfree86/os-support/bus/Pci.h +++ b/hw/xfree86/os-support/bus/Pci.h @@ -101,6 +101,10 @@ * This file has the private Pci definitions. The public ones are imported * from xf86Pci.h. Drivers should not use this file. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _PCI_H #define _PCI_H 1 diff --git a/hw/xfree86/os-support/bus/Sbus.c b/hw/xfree86/os-support/bus/Sbus.c index efe5c4ba6..168bc669e 100644 --- a/hw/xfree86/os-support/bus/Sbus.c +++ b/hw/xfree86/os-support/bus/Sbus.c @@ -22,6 +22,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Sbus.c,v 1.2tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <fcntl.h> #include <stdio.h> #include <unistd.h> diff --git a/hw/xfree86/os-support/bus/altixPCI.c b/hw/xfree86/os-support/bus/altixPCI.c index c2c21d39f..010f6619a 100644 --- a/hw/xfree86/os-support/bus/altixPCI.c +++ b/hw/xfree86/os-support/bus/altixPCI.c @@ -1,6 +1,10 @@ /* * This file contains the glue necessary for support of SGI's Altix chipset. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdio.h> #include <unistd.h> #include "altixPCI.h" diff --git a/hw/xfree86/os-support/bus/altixPCI.h b/hw/xfree86/os-support/bus/altixPCI.h index 1d449d55b..2a738f362 100644 --- a/hw/xfree86/os-support/bus/altixPCI.h +++ b/hw/xfree86/os-support/bus/altixPCI.h @@ -1,3 +1,7 @@ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef PCI_ALTIX_H #define PCI_ALTIX_H 1 diff --git a/hw/xfree86/os-support/bus/axpPci.c b/hw/xfree86/os-support/bus/axpPci.c index 04ff8b956..08c7fbd39 100644 --- a/hw/xfree86/os-support/bus/axpPci.c +++ b/hw/xfree86/os-support/bus/axpPci.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/axpPci.c,v 1.15 2002/12/12 04:12:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/axpPci.c,v 1.14 2002/12/11 02:44:28 dawes Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * @@ -45,6 +45,10 @@ * SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdio.h> #include "compiler.h" #include "xf86.h" diff --git a/hw/xfree86/os-support/bus/e8870PCI.c b/hw/xfree86/os-support/bus/e8870PCI.c index 9eb34a67a..65b0c0474 100644 --- a/hw/xfree86/os-support/bus/e8870PCI.c +++ b/hw/xfree86/os-support/bus/e8870PCI.c @@ -29,6 +29,10 @@ * This file contains the glue necessary for support of Intel's E8870 chipset. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "e8870PCI.h" #include "xf86.h" #include "Pci.h" diff --git a/hw/xfree86/os-support/bus/e8870PCI.h b/hw/xfree86/os-support/bus/e8870PCI.h index 2d16077ac..9efa0ed6d 100644 --- a/hw/xfree86/os-support/bus/e8870PCI.h +++ b/hw/xfree86/os-support/bus/e8870PCI.h @@ -25,6 +25,10 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef PCI_E8870_H #define PCI_E8870_H 1 diff --git a/hw/xfree86/os-support/bus/freebsdPci.c b/hw/xfree86/os-support/bus/freebsdPci.c index c3e621daf..f6d6f8a6d 100644 --- a/hw/xfree86/os-support/bus/freebsdPci.c +++ b/hw/xfree86/os-support/bus/freebsdPci.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/freebsdPci.c,v 1.5 2002/08/27 22:07:07 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/freebsdPci.c,v 1.4 2002/07/24 19:06:52 tsi Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * @@ -45,6 +45,10 @@ * SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdio.h> #include "compiler.h" #include "xf86.h" @@ -84,7 +88,7 @@ static pciBusInfo_t freebsdPci0 = { /* bridge */ NULL }; -#if !defined(__OpenBSD__) +#if !defined(__OpenBSD__) && !defined(__FreeBSD__) #if X_BYTE_ORDER == X_BIG_ENDIAN #ifdef __sparc__ #ifndef ASI_PL diff --git a/hw/xfree86/os-support/bus/ix86Pci.c b/hw/xfree86/os-support/bus/ix86Pci.c index 99e3ba245..6e2b650d1 100644 --- a/hw/xfree86/os-support/bus/ix86Pci.c +++ b/hw/xfree86/os-support/bus/ix86Pci.c @@ -136,6 +136,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdio.h> #include "compiler.h" #include "xf86.h" diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c index 32e11e4eb..2a21aa3ea 100644 --- a/hw/xfree86/os-support/bus/linuxPci.c +++ b/hw/xfree86/os-support/bus/linuxPci.c @@ -45,6 +45,10 @@ * SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdio.h> #include "compiler.h" #include "xf86.h" diff --git a/hw/xfree86/os-support/bus/netbsdPci.c b/hw/xfree86/os-support/bus/netbsdPci.c index 9c46ee3d3..7dbbfdec7 100644 --- a/hw/xfree86/os-support/bus/netbsdPci.c +++ b/hw/xfree86/os-support/bus/netbsdPci.c @@ -27,6 +27,10 @@ * authorization from the XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <sys/types.h> #include <sys/mman.h> #include <sys/ioctl.h> diff --git a/hw/xfree86/os-support/bus/ppcPci.c b/hw/xfree86/os-support/bus/ppcPci.c index 1be10ab9b..7a438af67 100644 --- a/hw/xfree86/os-support/bus/ppcPci.c +++ b/hw/xfree86/os-support/bus/ppcPci.c @@ -58,6 +58,10 @@ * SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdio.h> #include "compiler.h" #include "xf86.h" diff --git a/hw/xfree86/os-support/bus/sparcPci.c b/hw/xfree86/os-support/bus/sparcPci.c index 2ada6fd47..48e10ede4 100644 --- a/hw/xfree86/os-support/bus/sparcPci.c +++ b/hw/xfree86/os-support/bus/sparcPci.c @@ -25,6 +25,10 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/bus/xf86Pci.h b/hw/xfree86/os-support/bus/xf86Pci.h index d1284dc44..f0ab4307a 100644 --- a/hw/xfree86/os-support/bus/xf86Pci.h +++ b/hw/xfree86/os-support/bus/xf86Pci.h @@ -102,6 +102,10 @@ * Drivers should use this file rather than Pci.h. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86PCI_H #define _XF86PCI_H 1 #include <X11/Xarch.h> diff --git a/hw/xfree86/os-support/bus/xf86Sbus.h b/hw/xfree86/os-support/bus/xf86Sbus.h index 1ff4432b4..21b05cba4 100644 --- a/hw/xfree86/os-support/bus/xf86Sbus.h +++ b/hw/xfree86/os-support/bus/xf86Sbus.h @@ -22,6 +22,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h,v 1.3 2001/04/20 17:02:43 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86_SBUS_H #define _XF86_SBUS_H diff --git a/hw/xfree86/os-support/bus/zx1PCI.c b/hw/xfree86/os-support/bus/zx1PCI.c index 16f1b40a5..3d219c86f 100644 --- a/hw/xfree86/os-support/bus/zx1PCI.c +++ b/hw/xfree86/os-support/bus/zx1PCI.c @@ -31,6 +31,10 @@ * architectures. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "zx1PCI.h" #include "xf86.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/bus/zx1PCI.h b/hw/xfree86/os-support/bus/zx1PCI.h index f46a68a30..2795b4459 100644 --- a/hw/xfree86/os-support/bus/zx1PCI.h +++ b/hw/xfree86/os-support/bus/zx1PCI.h @@ -25,6 +25,10 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef PCI_ZX1_H #define PCI_ZX1_H 1 diff --git a/hw/xfree86/os-support/drm/drmmodule.c b/hw/xfree86/os-support/drm/drmmodule.c index 8be822445..fd751e756 100644 --- a/hw/xfree86/os-support/drm/drmmodule.c +++ b/hw/xfree86/os-support/drm/drmmodule.c @@ -25,10 +25,14 @@ * * Authors: Rickard E. (Rik) Faith <faith@valinux.com> * - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/drmmodule.c,v 1.3 2000/06/17 00:03:34 martin Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/drmmodule.c,v 1.2 2000/02/23 04:47:22 martin Exp $ * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Module.h" static MODULESETUPPROTO(drmSetup); @@ -39,7 +43,7 @@ static XF86ModuleVersionInfo VersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_EXTENSION, ABI_EXTENSION_VERSION, diff --git a/hw/xfree86/os-support/int10Defines.h b/hw/xfree86/os-support/int10Defines.h index 77d2f4db9..56e10cf67 100644 --- a/hw/xfree86/os-support/int10Defines.h +++ b/hw/xfree86/os-support/int10Defines.h @@ -26,6 +26,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _INT10DEFINES_H_ #define _INT10DEFINES_H_ 1 diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c index b01004931..b8e821cd1 100644 --- a/hw/xfree86/os-support/linux/int10/linux.c +++ b/hw/xfree86/os-support/linux/int10/linux.c @@ -3,6 +3,10 @@ * linux specific part of the int10 module * Copyright 1999, 2000, 2001, 2002, 2003, 2004 Egbert Eich */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c index dcde018ca..e99cde8da 100644 --- a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c +++ b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/os-support/linux/lnx.h b/hw/xfree86/os-support/linux/lnx.h index c3ccef280..68ad34011 100644 --- a/hw/xfree86/os-support/linux/lnx.h +++ b/hw/xfree86/os-support/linux/lnx.h @@ -1,5 +1,9 @@ /* $XFree86: Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef LNX_H_ # ifdef __alpha__ extern unsigned long _bus_base __P ((void)) __attribute__ ((const)); diff --git a/hw/xfree86/os-support/linux/lnxResource.c b/hw/xfree86/os-support/linux/lnxResource.c index 3b29618aa..690d3bc8f 100644 --- a/hw/xfree86/os-support/linux/lnxResource.c +++ b/hw/xfree86/os-support/linux/lnxResource.c @@ -2,6 +2,10 @@ /* Resource information code */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/linux/lnx_KbdMap.c b/hw/xfree86/os-support/linux/lnx_KbdMap.c index 61b2e12b5..f781aaba0 100644 --- a/hw/xfree86/os-support/linux/lnx_KbdMap.c +++ b/hw/xfree86/os-support/linux/lnx_KbdMap.c @@ -6,6 +6,10 @@ * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "input.h" diff --git a/hw/xfree86/os-support/linux/lnx_agp.c b/hw/xfree86/os-support/linux/lnx_agp.c index 316d4ecb2..7a2b0606b 100644 --- a/hw/xfree86/os-support/linux/lnx_agp.c +++ b/hw/xfree86/os-support/linux/lnx_agp.c @@ -9,6 +9,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c,v 3.11 2003/04/03 22:47:42 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c index 44dcb1198..9a50947f5 100644 --- a/hw/xfree86/os-support/linux/lnx_apm.c +++ b/hw/xfree86/os-support/linux/lnx_apm.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c,v 3.12 2001/12/24 22:54:31 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/os-support/linux/lnx_axp.c b/hw/xfree86/os-support/linux/lnx_axp.c index d408d1623..b479ca8ed 100644 --- a/hw/xfree86/os-support/linux/lnx_axp.c +++ b/hw/xfree86/os-support/linux/lnx_axp.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_axp.c,v 1.3 2001/02/15 11:03:56 alanh Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdio.h> #include <X11/X.h> #include <X11/os.h> diff --git a/hw/xfree86/os-support/linux/lnx_ev56.c b/hw/xfree86/os-support/linux/lnx_ev56.c index 05c1dd097..63077e907 100644 --- a/hw/xfree86/os-support/linux/lnx_ev56.c +++ b/hw/xfree86/os-support/linux/lnx_ev56.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_ev56.c,v 3.5 2000/02/17 13:45:49 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "input.h" #include "scrnintstr.h" diff --git a/hw/xfree86/os-support/linux/lnx_font.c b/hw/xfree86/os-support/linux/lnx_font.c index d809f97af..e9a5b6aef 100644 --- a/hw/xfree86/os-support/linux/lnx_font.c +++ b/hw/xfree86/os-support/linux/lnx_font.c @@ -23,6 +23,10 @@ *ings in this Software without prior written authorization from Egbert Eich. * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> diff --git a/hw/xfree86/os-support/linux/lnx_ia64.c b/hw/xfree86/os-support/linux/lnx_ia64.c index 06f2be777..cc9448f74 100644 --- a/hw/xfree86/os-support/linux/lnx_ia64.c +++ b/hw/xfree86/os-support/linux/lnx_ia64.c @@ -24,6 +24,10 @@ * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <sys/types.h> #include <sys/stat.h> #include <sys/utsname.h> diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c index 0bd33aea7..842d9a075 100644 --- a/hw/xfree86/os-support/linux/lnx_init.c +++ b/hw/xfree86/os-support/linux/lnx_init.c @@ -26,6 +26,10 @@ */ /* $XConsortium: lnx_init.c /main/7 1996/10/23 18:46:30 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> diff --git a/hw/xfree86/os-support/linux/lnx_io.c b/hw/xfree86/os-support/linux/lnx_io.c index 5de501ae8..8d1fb456b 100644 --- a/hw/xfree86/os-support/linux/lnx_io.c +++ b/hw/xfree86/os-support/linux/lnx_io.c @@ -26,6 +26,10 @@ /* $XConsortium: lnx_io.c /main/8 1996/10/19 18:06:28 kaleb $ */ #define NEED_EVENTS +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/linux/lnx_jstk.c b/hw/xfree86/os-support/linux/lnx_jstk.c index 2423bd45e..dafdc0594 100644 --- a/hw/xfree86/os-support/linux/lnx_jstk.c +++ b/hw/xfree86/os-support/linux/lnx_jstk.c @@ -23,10 +23,14 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_jstk.c,v 3.13 1998/07/25 16:56:43 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_jstk.c,v 3.8.2.1 1998/06/05 16:23:12 dawes Exp $ */ static const char rcs_id[] = "Id: lnx_jstk.c,v 1.1 1995/12/20 14:06:09 lepied Exp"; +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <sys/types.h> #include <unistd.h> #include <string.h> diff --git a/hw/xfree86/os-support/linux/lnx_kbd.c b/hw/xfree86/os-support/linux/lnx_kbd.c index aa959b927..dd6773fff 100644 --- a/hw/xfree86/os-support/linux/lnx_kbd.c +++ b/hw/xfree86/os-support/linux/lnx_kbd.c @@ -10,6 +10,10 @@ */ #define NEED_EVENTS +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/linux/lnx_kmod.c b/hw/xfree86/os-support/linux/lnx_kmod.c index 0cb69b209..c211d115a 100644 --- a/hw/xfree86/os-support/linux/lnx_kmod.c +++ b/hw/xfree86/os-support/linux/lnx_kmod.c @@ -1,4 +1,8 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kmod.c,v 3.6 2001/10/31 22:50:30 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kmod.c,v 3.5 2001/10/01 13:44:14 eich Exp $ */ + +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif #include <errno.h> #include <fcntl.h> diff --git a/hw/xfree86/os-support/linux/lnx_mouse.c b/hw/xfree86/os-support/linux/lnx_mouse.c index a03e2f747..d73c69853 100644 --- a/hw/xfree86/os-support/linux/lnx_mouse.c +++ b/hw/xfree86/os-support/linux/lnx_mouse.c @@ -4,6 +4,10 @@ * Copyright 1999 by The XFree86 Project, Inc. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Xinput.h" diff --git a/hw/xfree86/os-support/linux/lnx_pci.c b/hw/xfree86/os-support/linux/lnx_pci.c index 6b5bfa999..a20298ed4 100644 --- a/hw/xfree86/os-support/linux/lnx_pci.c +++ b/hw/xfree86/os-support/linux/lnx_pci.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c,v 3.8 2002/04/09 15:59:37 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdio.h> #include <X11/X.h> #include <X11/os.h> diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c index cd19f109a..371295ffd 100644 --- a/hw/xfree86/os-support/linux/lnx_video.c +++ b/hw/xfree86/os-support/linux/lnx_video.c @@ -25,6 +25,10 @@ */ /* $XConsortium: lnx_video.c /main/9 1996/10/19 18:06:34 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "input.h" #include "scrnintstr.h" diff --git a/hw/xfree86/os-support/lynxos/lynx_init.c b/hw/xfree86/os-support/lynxos/lynx_init.c index 36d88a434..84db50127 100644 --- a/hw/xfree86/os-support/lynxos/lynx_init.c +++ b/hw/xfree86/os-support/lynxos/lynx_init.c @@ -24,6 +24,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_init.c,v 3.2 1998/07/25 16:56:45 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> diff --git a/hw/xfree86/os-support/lynxos/lynx_io.c b/hw/xfree86/os-support/lynxos/lynx_io.c index 364f9ee4d..afd3f8962 100644 --- a/hw/xfree86/os-support/lynxos/lynx_io.c +++ b/hw/xfree86/os-support/lynxos/lynx_io.c @@ -23,6 +23,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_io.c,v 3.9 2002/10/11 01:40:35 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/lynxos/lynx_mmap.c b/hw/xfree86/os-support/lynxos/lynx_mmap.c index 989ee8aab..c00b6700f 100644 --- a/hw/xfree86/os-support/lynxos/lynx_mmap.c +++ b/hw/xfree86/os-support/lynxos/lynx_mmap.c @@ -23,6 +23,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_mmap.c,v 3.5 1998/08/29 05:43:58 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" diff --git a/hw/xfree86/os-support/lynxos/lynx_mouse.c b/hw/xfree86/os-support/lynxos/lynx_mouse.c index 2edb147fe..68aca5d38 100644 --- a/hw/xfree86/os-support/lynxos/lynx_mouse.c +++ b/hw/xfree86/os-support/lynxos/lynx_mouse.c @@ -4,6 +4,10 @@ * Copyright 1999 by The XFree86 Project, Inc. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Xinput.h" diff --git a/hw/xfree86/os-support/lynxos/lynx_noinline.c b/hw/xfree86/os-support/lynxos/lynx_noinline.c index 858b0eb65..1c12f62f9 100644 --- a/hw/xfree86/os-support/lynxos/lynx_noinline.c +++ b/hw/xfree86/os-support/lynxos/lynx_noinline.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_noinline.c,v 3.6 2002/01/25 21:56:20 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_noinline.c,v 3.5 2000/07/31 23:25:18 tsi Exp $ */ /* * Copyright 1998 by Metro Link Incorporated * @@ -23,6 +23,10 @@ * SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #if /* NO_INLINE && */ defined(__powerpc__) #include "xf86Pci.h" diff --git a/hw/xfree86/os-support/lynxos/lynx_video.c b/hw/xfree86/os-support/lynxos/lynx_video.c index d9dd43d55..5d0949091 100644 --- a/hw/xfree86/os-support/lynxos/lynx_video.c +++ b/hw/xfree86/os-support/lynxos/lynx_video.c @@ -23,6 +23,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_video.c,v 3.17 2000/10/28 01:42:27 mvojkovi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "input.h" #include "scrnintstr.h" diff --git a/hw/xfree86/os-support/misc/BUSmemcpy.c b/hw/xfree86/os-support/misc/BUSmemcpy.c index b4379f7be..9ff14396c 100644 --- a/hw/xfree86/os-support/misc/BUSmemcpy.c +++ b/hw/xfree86/os-support/misc/BUSmemcpy.c @@ -14,6 +14,10 @@ Thanks to Linus Torvalds for contributing this code. /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.c,v 1.3 1999/12/03 19:17:44 eich Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/misc/Delay.c b/hw/xfree86/os-support/misc/Delay.c index 1c0e5d9f2..33d0789fd 100644 --- a/hw/xfree86/os-support/misc/Delay.c +++ b/hw/xfree86/os-support/misc/Delay.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/Delay.c,v 3.3 2000/12/08 20:13:38 eich Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef __UNIXOS2__ #define I_NEED_OS2_H #endif diff --git a/hw/xfree86/os-support/misc/IODelay.c b/hw/xfree86/os-support/misc/IODelay.c index f3afcdd50..697c07f61 100644 --- a/hw/xfree86/os-support/misc/IODelay.c +++ b/hw/xfree86/os-support/misc/IODelay.c @@ -6,6 +6,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.c,v 1.1.2.1 1998/06/04 17:35:59 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/misc/SlowBcopy.c b/hw/xfree86/os-support/misc/SlowBcopy.c index 9a105864e..ec2c67ffa 100644 --- a/hw/xfree86/os-support/misc/SlowBcopy.c +++ b/hw/xfree86/os-support/misc/SlowBcopy.c @@ -16,6 +16,10 @@ * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/misc/xf86_IlHack.c b/hw/xfree86/os-support/misc/xf86_IlHack.c index 019156357..d8053f7d2 100644 --- a/hw/xfree86/os-support/misc/xf86_IlHack.c +++ b/hw/xfree86/os-support/misc/xf86_IlHack.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c,v 3.5 1998/07/25 16:56:51 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c,v 3.4.4.1 1998/06/04 17:36:01 dawes Exp $ */ /* * This file is an incredible crock to get the normally-inline functions * built into the server so that things can be debugged properly. @@ -12,4 +12,8 @@ #define __inline__ /**/ #undef NO_INLINE #define DO_PROTOTYPES +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "compiler.h" diff --git a/hw/xfree86/os-support/misc/xf86_Util.c b/hw/xfree86/os-support/misc/xf86_Util.c index a94ad34cc..9f251440a 100644 --- a/hw/xfree86/os-support/misc/xf86_Util.c +++ b/hw/xfree86/os-support/misc/xf86_Util.c @@ -29,6 +29,10 @@ * dependencies are dealt with, as this library will be linked in last. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <ctype.h> /* To prevent empty source file warnings */ diff --git a/hw/xfree86/os-support/sco/VTsw_sco.c b/hw/xfree86/os-support/sco/VTsw_sco.c index 3489a0777..e0e7912b6 100644 --- a/hw/xfree86/os-support/sco/VTsw_sco.c +++ b/hw/xfree86/os-support/sco/VTsw_sco.c @@ -24,6 +24,10 @@ */ /* $XConsortium: VTsw_sco.c /main/2 1995/11/13 06:08:36 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" diff --git a/hw/xfree86/os-support/sco/sco_init.c b/hw/xfree86/os-support/sco/sco_init.c index a0c572858..d200eccb4 100644 --- a/hw/xfree86/os-support/sco/sco_init.c +++ b/hw/xfree86/os-support/sco/sco_init.c @@ -24,6 +24,10 @@ /* Re-written May 2001 to represent the current state of reality */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> diff --git a/hw/xfree86/os-support/sco/sco_io.c b/hw/xfree86/os-support/sco/sco_io.c index 18abcc8dc..fd4c9b780 100644 --- a/hw/xfree86/os-support/sco/sco_io.c +++ b/hw/xfree86/os-support/sco/sco_io.c @@ -24,6 +24,10 @@ /* Re-written May 2001 to represent the current state of reality */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/sco/sco_iop.c b/hw/xfree86/os-support/sco/sco_iop.c index f056dcbe1..e9bf72890 100644 --- a/hw/xfree86/os-support/sco/sco_iop.c +++ b/hw/xfree86/os-support/sco/sco_iop.c @@ -23,6 +23,10 @@ /* $XConsortium$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/sco/sco_mouse.c b/hw/xfree86/os-support/sco/sco_mouse.c index 0df225b12..9e167852b 100644 --- a/hw/xfree86/os-support/sco/sco_mouse.c +++ b/hw/xfree86/os-support/sco/sco_mouse.c @@ -23,6 +23,10 @@ /* $XConsortium$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/sco/sco_video.c b/hw/xfree86/os-support/sco/sco_video.c index 76d70fbd6..dd81786bb 100644 --- a/hw/xfree86/os-support/sco/sco_video.c +++ b/hw/xfree86/os-support/sco/sco_video.c @@ -37,6 +37,10 @@ * that and adjust accordingly. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "input.h" #include "scrnintstr.h" diff --git a/hw/xfree86/os-support/shared/VTsw_noop.c b/hw/xfree86/os-support/shared/VTsw_noop.c index 795a65610..ac8ae3b0a 100644 --- a/hw/xfree86/os-support/shared/VTsw_noop.c +++ b/hw/xfree86/os-support/shared/VTsw_noop.c @@ -23,6 +23,10 @@ */ /* $XConsortium: VTsw_noop.c /main/3 1996/02/21 17:53:25 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" diff --git a/hw/xfree86/os-support/shared/VTsw_usl.c b/hw/xfree86/os-support/shared/VTsw_usl.c index 3c0ca6b6e..b38470aea 100644 --- a/hw/xfree86/os-support/shared/VTsw_usl.c +++ b/hw/xfree86/os-support/shared/VTsw_usl.c @@ -23,6 +23,10 @@ */ /* $XConsortium: VTsw_usl.c /main/3 1996/02/21 17:53:28 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" diff --git a/hw/xfree86/os-support/shared/agp_noop.c b/hw/xfree86/os-support/shared/agp_noop.c index 8c2da5166..dc176fec9 100644 --- a/hw/xfree86/os-support/shared/agp_noop.c +++ b/hw/xfree86/os-support/shared/agp_noop.c @@ -31,6 +31,10 @@ * AGP GART support. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef __UNIXOS2__ # define I_NEED_OS2_H #endif diff --git a/hw/xfree86/os-support/shared/at_scancode.c b/hw/xfree86/os-support/shared/at_scancode.c index 0b9bc674c..8947254bc 100644 --- a/hw/xfree86/os-support/shared/at_scancode.c +++ b/hw/xfree86/os-support/shared/at_scancode.c @@ -26,6 +26,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86Xinput.h" #include "xf86OSKbd.h" diff --git a/hw/xfree86/os-support/shared/bios_devmem.c b/hw/xfree86/os-support/shared/bios_devmem.c index 5e516221d..8bd6d3f3e 100644 --- a/hw/xfree86/os-support/shared/bios_devmem.c +++ b/hw/xfree86/os-support/shared/bios_devmem.c @@ -23,6 +23,10 @@ */ /* $XConsortium: bios_devmem.c /main/5 1996/10/19 18:07:41 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/shared/bios_mmap.c b/hw/xfree86/os-support/shared/bios_mmap.c index c5cb404eb..b4ff8c31f 100644 --- a/hw/xfree86/os-support/shared/bios_mmap.c +++ b/hw/xfree86/os-support/shared/bios_mmap.c @@ -23,6 +23,10 @@ */ /* $XConsortium: bios_V4mmap.c /main/4 1996/02/21 17:54:27 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" diff --git a/hw/xfree86/os-support/shared/ia64Pci.c b/hw/xfree86/os-support/shared/ia64Pci.c index 30a062276..ff4312bf5 100644 --- a/hw/xfree86/os-support/shared/ia64Pci.c +++ b/hw/xfree86/os-support/shared/ia64Pci.c @@ -29,6 +29,10 @@ * This file contains the glue needed to support various IA-64 chipsets. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <fcntl.h> #include <unistd.h> #include <signal.h> diff --git a/hw/xfree86/os-support/shared/ia64Pci.h b/hw/xfree86/os-support/shared/ia64Pci.h index bc4777dbb..978c9ff0e 100644 --- a/hw/xfree86/os-support/shared/ia64Pci.h +++ b/hw/xfree86/os-support/shared/ia64Pci.h @@ -23,6 +23,10 @@ *ings in this Software without prior written authorization from Egbert Eich. * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _IA64_PCI_H # define _IA64_PCI_H diff --git a/hw/xfree86/os-support/shared/ioperm_noop.c b/hw/xfree86/os-support/shared/ioperm_noop.c index af5724cf1..b3ea044f9 100644 --- a/hw/xfree86/os-support/shared/ioperm_noop.c +++ b/hw/xfree86/os-support/shared/ioperm_noop.c @@ -28,6 +28,10 @@ * or the permissions are implicit with opening/enabling the console. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/shared/kbd.c b/hw/xfree86/os-support/shared/kbd.c index 213e8bd62..822c8fe52 100644 --- a/hw/xfree86/os-support/shared/kbd.c +++ b/hw/xfree86/os-support/shared/kbd.c @@ -26,6 +26,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86OSKbd.h" Bool diff --git a/hw/xfree86/os-support/shared/kmod_noop.c b/hw/xfree86/os-support/shared/kmod_noop.c index ae6852ed9..620e9bf35 100644 --- a/hw/xfree86/os-support/shared/kmod_noop.c +++ b/hw/xfree86/os-support/shared/kmod_noop.c @@ -26,6 +26,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86_OSproc.h" int xf86LoadKernelModule(const char *pathname) diff --git a/hw/xfree86/os-support/shared/libc_wrapper.c b/hw/xfree86/os-support/shared/libc_wrapper.c index 66d15b261..a77e2b94c 100644 --- a/hw/xfree86/os-support/shared/libc_wrapper.c +++ b/hw/xfree86/os-support/shared/libc_wrapper.c @@ -23,6 +23,10 @@ * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #if defined(linux) && !defined(__GLIBC__) #undef __STRICT_ANSI__ #endif diff --git a/hw/xfree86/os-support/shared/pm_noop.c b/hw/xfree86/os-support/shared/pm_noop.c index 4225e6dd4..d17ce3812 100644 --- a/hw/xfree86/os-support/shared/pm_noop.c +++ b/hw/xfree86/os-support/shared/pm_noop.c @@ -28,6 +28,10 @@ /* Stubs for the OS-support layer power-management functions. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c index 362c8bcdc..be3703944 100644 --- a/hw/xfree86/os-support/shared/posix_tty.c +++ b/hw/xfree86/os-support/shared/posix_tty.c @@ -55,6 +55,10 @@ /* $XConsortium: posix_tty.c /main/7 1996/10/19 18:07:47 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c index 3fef72e17..f7e0c45bd 100644 --- a/hw/xfree86/os-support/shared/sigio.c +++ b/hw/xfree86/os-support/shared/sigio.c @@ -54,6 +54,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef XFree86Server # include <X11/X.h> # include "xf86.h" diff --git a/hw/xfree86/os-support/shared/sigiostubs.c b/hw/xfree86/os-support/shared/sigiostubs.c index 358981f10..c79055853 100644 --- a/hw/xfree86/os-support/shared/sigiostubs.c +++ b/hw/xfree86/os-support/shared/sigiostubs.c @@ -27,6 +27,10 @@ */ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/shared/sigiostubs.c,v 1.3 2005/04/20 12:25:38 daniels Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef XFree86Server #ifdef __UNIXOS2__ # define I_NEED_OS2_H diff --git a/hw/xfree86/os-support/shared/stdPci.c b/hw/xfree86/os-support/shared/stdPci.c index ba0574f24..491406f92 100644 --- a/hw/xfree86/os-support/shared/stdPci.c +++ b/hw/xfree86/os-support/shared/stdPci.c @@ -26,6 +26,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef __UNIXOS2__ # define I_NEED_OS2_H #endif diff --git a/hw/xfree86/os-support/shared/stdResource.c b/hw/xfree86/os-support/shared/stdResource.c index 72ab99849..4704d8194 100644 --- a/hw/xfree86/os-support/shared/stdResource.c +++ b/hw/xfree86/os-support/shared/stdResource.c @@ -28,6 +28,10 @@ /* Standard resource information code */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef __UNIXOS2__ # define I_NEED_OS2_H #endif diff --git a/hw/xfree86/os-support/shared/std_kbdEv.c b/hw/xfree86/os-support/shared/std_kbdEv.c index 2a030c3dc..c678162c2 100644 --- a/hw/xfree86/os-support/shared/std_kbdEv.c +++ b/hw/xfree86/os-support/shared/std_kbdEv.c @@ -25,6 +25,10 @@ */ /* $XConsortium: std_kbdEv.c /main/4 1996/03/11 10:47:33 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/shared/sysv_kbd.c b/hw/xfree86/os-support/shared/sysv_kbd.c index 5421b11c3..dd1ca3356 100644 --- a/hw/xfree86/os-support/shared/sysv_kbd.c +++ b/hw/xfree86/os-support/shared/sysv_kbd.c @@ -25,6 +25,10 @@ */ /* $XConsortium: sysv_kbd.c /main/3 1996/02/21 17:53:59 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/shared/vidmem.c b/hw/xfree86/os-support/shared/vidmem.c index 29c8a2171..237d47a4d 100644 --- a/hw/xfree86/os-support/shared/vidmem.c +++ b/hw/xfree86/os-support/shared/vidmem.c @@ -27,6 +27,10 @@ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef __UNIXOS2__ # define I_NEED_OS2_H #endif diff --git a/hw/xfree86/os-support/shared/xf86Axp.c b/hw/xfree86/os-support/shared/xf86Axp.c index 42edbc53c..b8953f119 100644 --- a/hw/xfree86/os-support/shared/xf86Axp.c +++ b/hw/xfree86/os-support/shared/xf86Axp.c @@ -26,6 +26,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Axp.h" axpParams xf86AXPParams[] = { diff --git a/hw/xfree86/os-support/shared/xf86Axp.h b/hw/xfree86/os-support/shared/xf86Axp.h index e63619e3a..4b8b08370 100644 --- a/hw/xfree86/os-support/shared/xf86Axp.h +++ b/hw/xfree86/os-support/shared/xf86Axp.h @@ -1,4 +1,8 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/xf86Axp.h,v 1.3 2001/02/15 19:46:03 eich Exp $ */ +/* $XFree86$ */ + +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif #ifndef _XF86_AXP_H_ #define _XF86_AXP_H_ diff --git a/hw/xfree86/os-support/solaris/sun_bios.c b/hw/xfree86/os-support/solaris/sun_bios.c index d1c79888b..8319de04e 100644 --- a/hw/xfree86/os-support/solaris/sun_bios.c +++ b/hw/xfree86/os-support/solaris/sun_bios.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_bios.c,v 1.2 2001/10/28 03:34:02 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_bios.c,v 1.2tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat <dwex@goblin.org> @@ -23,6 +23,10 @@ * OF THIS SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef i386 #define _NEED_SYSI86 #endif @@ -71,7 +75,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, { if (!xf86LinearVidMem()) FatalError("xf86ReadBIOS: Could not mmap BIOS" - " [a=%x]\n", Base); + " [a=%lx]\n", Base); sprintf(solx86_vtname, apertureDevName); } @@ -86,7 +90,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, if (ptr == MAP_FAILED) { xf86Msg(X_WARNING, "xf86ReadBIOS: %s mmap failed " - "[0x%05x, 0x%04x]\n", + "[0x%08lx, 0x%04x]\n", solx86_vtname, Base, mlen); close(fd); return -1; diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c index 97c6dba39..40c264ce0 100644 --- a/hw/xfree86/os-support/solaris/sun_init.c +++ b/hw/xfree86/os-support/solaris/sun_init.c @@ -24,6 +24,10 @@ */ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_init.c,v 1.3 2005/05/21 07:46:37 alanc Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/solaris/sun_io.c b/hw/xfree86/os-support/solaris/sun_io.c index 27996d312..c4dc23669 100644 --- a/hw/xfree86/os-support/solaris/sun_io.c +++ b/hw/xfree86/os-support/solaris/sun_io.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_io.c,v 1.3 2003/02/17 15:12:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_io.c,v 1.2 2002/10/11 01:40:37 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes <dawes@xfree86.org> @@ -24,6 +24,10 @@ * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/solaris/sun_kbd.c b/hw/xfree86/os-support/solaris/sun_kbd.c index 56929d69b..35d3a7731 100644 --- a/hw/xfree86/os-support/solaris/sun_kbd.c +++ b/hw/xfree86/os-support/solaris/sun_kbd.c @@ -25,6 +25,10 @@ */ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbd.c,v 1.3 2004/06/13 04:50:21 alanc Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/solaris/sun_kbdEv.c b/hw/xfree86/os-support/solaris/sun_kbdEv.c index eba420937..620b18d18 100644 --- a/hw/xfree86/os-support/solaris/sun_kbdEv.c +++ b/hw/xfree86/os-support/solaris/sun_kbdEv.c @@ -25,6 +25,10 @@ /* [JCH-96/01/21] Extended std reverse map to four buttons. */ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbdEv.c,v 1.5 2005/05/21 07:46:37 alanc Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86Priv.h" #include "xf86_OSlib.h" diff --git a/hw/xfree86/os-support/solaris/sun_mouse.c b/hw/xfree86/os-support/solaris/sun_mouse.c index b3fedbd0f..be01f8905 100644 --- a/hw/xfree86/os-support/solaris/sun_mouse.c +++ b/hw/xfree86/os-support/solaris/sun_mouse.c @@ -53,6 +53,10 @@ * of the copyright holder. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSlib.h" #include "xf86OSmouse.h" diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c index 60d60f9e1..3db537a3a 100644 --- a/hw/xfree86/os-support/solaris/sun_vid.c +++ b/hw/xfree86/os-support/solaris/sun_vid.c @@ -23,6 +23,10 @@ * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #if defined(i386) || defined(__x86) #define _NEED_SYSI86 #endif diff --git a/hw/xfree86/os-support/sysv/sysv_init.c b/hw/xfree86/os-support/sysv/sysv_init.c index ebd2bacc4..3edffd446 100644 --- a/hw/xfree86/os-support/sysv/sysv_init.c +++ b/hw/xfree86/os-support/sysv/sysv_init.c @@ -25,6 +25,10 @@ */ /* $XConsortium: sysv_init.c /main/4 1996/02/21 17:54:31 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> diff --git a/hw/xfree86/os-support/sysv/sysv_io.c b/hw/xfree86/os-support/sysv/sysv_io.c index 3c9e8e353..6fb642bce 100644 --- a/hw/xfree86/os-support/sysv/sysv_io.c +++ b/hw/xfree86/os-support/sysv/sysv_io.c @@ -25,6 +25,10 @@ */ /* $XConsortium: sysv_io.c /main/8 1996/10/19 18:08:06 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/sysv/sysv_mouse.c b/hw/xfree86/os-support/sysv/sysv_mouse.c index 7365faa06..f839362fc 100644 --- a/hw/xfree86/os-support/sysv/sysv_mouse.c +++ b/hw/xfree86/os-support/sysv/sysv_mouse.c @@ -4,6 +4,10 @@ * Copyright 1999 by The XFree86 Project, Inc. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "xf86.h" #include "xf86Xinput.h" diff --git a/hw/xfree86/os-support/sysv/sysv_video.c b/hw/xfree86/os-support/sysv/sysv_video.c index cff22e3fe..e8c26dada 100644 --- a/hw/xfree86/os-support/sysv/sysv_video.c +++ b/hw/xfree86/os-support/sysv/sysv_video.c @@ -25,6 +25,10 @@ */ /* $XConsortium: sysv_video.c /main/8 1996/10/25 11:38:09 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #define _NEED_SYSI86 diff --git a/hw/xfree86/os-support/sysv/xqueue.c b/hw/xfree86/os-support/sysv/xqueue.c index 755be3dab..a14fc32e6 100644 --- a/hw/xfree86/os-support/sysv/xqueue.c +++ b/hw/xfree86/os-support/sysv/xqueue.c @@ -24,6 +24,10 @@ */ /* $XConsortium: xqueue.c /main/8 1996/10/19 18:08:11 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "compiler.h" diff --git a/hw/xfree86/os-support/sysv/xqueue.h b/hw/xfree86/os-support/sysv/xqueue.h index 2085a3e70..d693d2b36 100644 --- a/hw/xfree86/os-support/sysv/xqueue.h +++ b/hw/xfree86/os-support/sysv/xqueue.h @@ -1,4 +1,8 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.h,v 1.1 1999/05/22 08:40:18 dawes Exp $ */ +/* $XFree86$ */ + +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif #ifndef _XF86_XQUEUE_H_ #define _XF86_XQUEUE_H_ diff --git a/hw/xfree86/os-support/xf86OSKbd.h b/hw/xfree86/os-support/xf86OSKbd.h index 1b5124a55..fa2253655 100644 --- a/hw/xfree86/os-support/xf86OSKbd.h +++ b/hw/xfree86/os-support/xf86OSKbd.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86OSKbd.h,v 1.5 2003/08/24 19:58:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86OSKbd.h,v 1.5tsi Exp $ */ /* * Copyright (c) 2002-2003 by The XFree86 Project, Inc. * @@ -28,6 +28,10 @@ * Author: Ivan Pascal. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Xinput.h" Bool ATScancode(InputInfoPtr pInfo, int *scanCode); @@ -104,7 +108,7 @@ typedef enum { PROT_XQUEUE, PROT_WSCONS, PROT_USB, - PROT_UNKNOWN + PROT_UNKNOWN_KBD } KbdProtocolId; typedef struct { diff --git a/hw/xfree86/os-support/xf86OSmouse.h b/hw/xfree86/os-support/xf86OSmouse.h index 7cb732237..879262991 100644 --- a/hw/xfree86/os-support/xf86OSmouse.h +++ b/hw/xfree86/os-support/xf86OSmouse.h @@ -28,6 +28,10 @@ /* Public interface to OS-specific mouse support. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86OSMOUSE_H_ #define _XF86OSMOUSE_H_ diff --git a/hw/xfree86/os-support/xf86OSpriv.h b/hw/xfree86/os-support/xf86OSpriv.h index 865738c40..449e8ddd0 100644 --- a/hw/xfree86/os-support/xf86OSpriv.h +++ b/hw/xfree86/os-support/xf86OSpriv.h @@ -26,6 +26,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86OSPRIV_H #define _XF86OSPRIV_H diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h index b65420e2b..e49e4a22c 100644 --- a/hw/xfree86/os-support/xf86_OSlib.h +++ b/hw/xfree86/os-support/xf86_OSlib.h @@ -74,6 +74,10 @@ * may include xf86_OSproc.h to get prototypes for public interfaces. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86_OSLIB_H #define _XF86_OSLIB_H diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h index f50c00ea3..391baebc6 100644 --- a/hw/xfree86/os-support/xf86_OSproc.h +++ b/hw/xfree86/os-support/xf86_OSproc.h @@ -66,6 +66,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h,v 3.56 2003/08/24 17:37:03 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86_OSPROC_H #define _XF86_OSPROC_H diff --git a/hw/xfree86/os-support/xf86_ansic.h b/hw/xfree86/os-support/xf86_ansic.h index 9bae4ba69..ea2216b39 100644 --- a/hw/xfree86/os-support/xf86_ansic.h +++ b/hw/xfree86/os-support/xf86_ansic.h @@ -23,6 +23,10 @@ * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86_ANSIC_H #define _XF86_ANSIC_H diff --git a/hw/xfree86/os-support/xf86_libc.h b/hw/xfree86/os-support/xf86_libc.h index 5f0f78f02..ecdbfeac5 100644 --- a/hw/xfree86/os-support/xf86_libc.h +++ b/hw/xfree86/os-support/xf86_libc.h @@ -42,6 +42,10 @@ * 0.1 Feb 24 1997 hide the trivial functions mem* str* */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef XF86_LIBC_H #define XF86_LIBC_H 1 diff --git a/hw/xfree86/parser/Configint.h b/hw/xfree86/parser/Configint.h index 1659d1be4..a51116b55 100644 --- a/hw/xfree86/parser/Configint.h +++ b/hw/xfree86/parser/Configint.h @@ -59,6 +59,10 @@ * they should not be visible outside of the parser. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _Configint_h_ #define _Configint_h_ diff --git a/hw/xfree86/parser/DRI.c b/hw/xfree86/parser/DRI.c index 695c16505..93d0d4b52 100644 --- a/hw/xfree86/parser/DRI.c +++ b/hw/xfree86/parser/DRI.c @@ -28,6 +28,10 @@ * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Device.c b/hw/xfree86/parser/Device.c index 9bfe4d1b9..6eb2857f0 100644 --- a/hw/xfree86/parser/Device.c +++ b/hw/xfree86/parser/Device.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Extensions.c b/hw/xfree86/parser/Extensions.c index 0c51a6e33..b64f08111 100644 --- a/hw/xfree86/parser/Extensions.c +++ b/hw/xfree86/parser/Extensions.c @@ -31,6 +31,10 @@ * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Files.c b/hw/xfree86/parser/Files.c index fd18dcf2e..cbbcc74c8 100644 --- a/hw/xfree86/parser/Files.c +++ b/hw/xfree86/parser/Files.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/Xos.h> #include "xf86Parser.h" #include "xf86tokens.h" diff --git a/hw/xfree86/parser/Flags.c b/hw/xfree86/parser/Flags.c index e6326a74e..bda24df1b 100644 --- a/hw/xfree86/parser/Flags.c +++ b/hw/xfree86/parser/Flags.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Input.c b/hw/xfree86/parser/Input.c index 6e38bdd15..9f9323f05 100644 --- a/hw/xfree86/parser/Input.c +++ b/hw/xfree86/parser/Input.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Keyboard.c b/hw/xfree86/parser/Keyboard.c index cca3ce412..4ba893a9d 100644 --- a/hw/xfree86/parser/Keyboard.c +++ b/hw/xfree86/parser/Keyboard.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Layout.c b/hw/xfree86/parser/Layout.c index 9907d29c8..56d92a79c 100644 --- a/hw/xfree86/parser/Layout.c +++ b/hw/xfree86/parser/Layout.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Module.c b/hw/xfree86/parser/Module.c index 33b591d88..7a5a25207 100644 --- a/hw/xfree86/parser/Module.c +++ b/hw/xfree86/parser/Module.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Monitor.c b/hw/xfree86/parser/Monitor.c index faafa1a7f..8669471a7 100644 --- a/hw/xfree86/parser/Monitor.c +++ b/hw/xfree86/parser/Monitor.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Pointer.c b/hw/xfree86/parser/Pointer.c index 8b373c562..81984a3e7 100644 --- a/hw/xfree86/parser/Pointer.c +++ b/hw/xfree86/parser/Pointer.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Screen.c b/hw/xfree86/parser/Screen.c index e3bf18048..d572af56c 100644 --- a/hw/xfree86/parser/Screen.c +++ b/hw/xfree86/parser/Screen.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Vendor.c b/hw/xfree86/parser/Vendor.c index fbbb2e00f..9c6469bb8 100644 --- a/hw/xfree86/parser/Vendor.c +++ b/hw/xfree86/parser/Vendor.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/Video.c b/hw/xfree86/parser/Video.c index de65c415e..88788aea8 100644 --- a/hw/xfree86/parser/Video.c +++ b/hw/xfree86/parser/Video.c @@ -55,6 +55,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h index cc694666f..bb5f4e9b2 100644 --- a/hw/xfree86/parser/configProcs.h +++ b/hw/xfree86/parser/configProcs.h @@ -121,6 +121,10 @@ XF86ConfExtensionsPtr xf86parseExtensionsSection (void); void xf86printExtensionsSection (FILE * cf, XF86ConfExtensionsPtr ptr); void xf86freeExtensions (XF86ConfExtensionsPtr ptr); +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef IN_XSERVER /* Externally provided functions */ void ErrorF(const char *f, ...); diff --git a/hw/xfree86/parser/cpconfig.c b/hw/xfree86/parser/cpconfig.c index e2dbb3e91..4eb635b30 100644 --- a/hw/xfree86/parser/cpconfig.c +++ b/hw/xfree86/parser/cpconfig.c @@ -29,6 +29,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <stdio.h> #include <stdlib.h> #include <stdarg.h> diff --git a/hw/xfree86/parser/read.c b/hw/xfree86/parser/read.c index 2946dc8b1..59b0ea6fb 100644 --- a/hw/xfree86/parser/read.c +++ b/hw/xfree86/parser/read.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c index d97954d2e..ce3cda128 100644 --- a/hw/xfree86/parser/scan.c +++ b/hw/xfree86/parser/scan.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <ctype.h> #include <stdio.h> #include <stdlib.h> diff --git a/hw/xfree86/parser/write.c b/hw/xfree86/parser/write.c index 499b6a11e..285080d99 100644 --- a/hw/xfree86/parser/write.c +++ b/hw/xfree86/parser/write.c @@ -56,6 +56,10 @@ /* View/edit this file with tab stops set to 4 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Parser.h" #include "xf86tokens.h" #include "Configint.h" diff --git a/hw/xfree86/parser/xf86Optrec.h b/hw/xfree86/parser/xf86Optrec.h index d7a1e7ae5..c38f2c219 100644 --- a/hw/xfree86/parser/xf86Optrec.h +++ b/hw/xfree86/parser/xf86Optrec.h @@ -58,6 +58,10 @@ * This file contains the Option Record that is passed between the Parser, * and Module setup procs. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _xf86Optrec_h_ #define _xf86Optrec_h_ #include <stdio.h> diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h index b6a974d3c..71568842d 100644 --- a/hw/xfree86/parser/xf86Parser.h +++ b/hw/xfree86/parser/xf86Parser.h @@ -58,6 +58,10 @@ * This file contains the external interfaces for the XFree86 configuration * file parser. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _xf86Parser_h_ #define _xf86Parser_h_ diff --git a/hw/xfree86/parser/xf86tokens.h b/hw/xfree86/parser/xf86tokens.h index 387773dc0..3c7e68ece 100644 --- a/hw/xfree86/parser/xf86tokens.h +++ b/hw/xfree86/parser/xf86tokens.h @@ -54,6 +54,10 @@ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _xf86_tokens_h #define _xf86_tokens_h diff --git a/hw/xfree86/rac/xf86RAC.c b/hw/xfree86/rac/xf86RAC.c index 3fa3ee911..13b697d85 100644 --- a/hw/xfree86/rac/xf86RAC.c +++ b/hw/xfree86/rac/xf86RAC.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.c,v 1.5 1999/06/12 17:30:21 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/rac/xf86RAC.h b/hw/xfree86/rac/xf86RAC.h index 68adaa31a..f500b56d7 100644 --- a/hw/xfree86/rac/xf86RAC.h +++ b/hw/xfree86/rac/xf86RAC.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.h,v 1.2 1999/05/15 12:10:33 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef __XF86RAC_H #define __XF86RAC_H 1 diff --git a/hw/xfree86/rac/xf86RACmodule.c b/hw/xfree86/rac/xf86RACmodule.c index 83c60e3fd..7221b9dac 100644 --- a/hw/xfree86/rac/xf86RACmodule.c +++ b/hw/xfree86/rac/xf86RACmodule.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RACmodule.c,v 1.3 1999/01/17 10:54:12 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Module.h" static XF86ModuleVersionInfo racVersRec = diff --git a/hw/xfree86/ramdac/BT.c b/hw/xfree86/ramdac/BT.c index 440b0021b..346b902dd 100644 --- a/hw/xfree86/ramdac/BT.c +++ b/hw/xfree86/ramdac/BT.c @@ -25,6 +25,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.c,v 1.7 2000/10/20 12:57:27 alanh Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ramdac/BT.h b/hw/xfree86/ramdac/BT.h index c52b5a745..f01357a09 100644 --- a/hw/xfree86/ramdac/BT.h +++ b/hw/xfree86/ramdac/BT.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.h,v 1.2 1998/07/25 16:57:17 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86RamDac.h" RamDacHelperRecPtr BTramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs); diff --git a/hw/xfree86/ramdac/BTPriv.h b/hw/xfree86/ramdac/BTPriv.h index 67469d2ed..17edaefdc 100644 --- a/hw/xfree86/ramdac/BTPriv.h +++ b/hw/xfree86/ramdac/BTPriv.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BTPriv.h,v 1.1.2.1 1998/07/18 17:54:00 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "BT.h" typedef struct { diff --git a/hw/xfree86/ramdac/IBM.c b/hw/xfree86/ramdac/IBM.c index 4fede5720..bf9b729d8 100644 --- a/hw/xfree86/ramdac/IBM.c +++ b/hw/xfree86/ramdac/IBM.c @@ -25,6 +25,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.c,v 1.12 2003/02/17 16:08:29 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ramdac/IBM.h b/hw/xfree86/ramdac/IBM.h index eb211883c..14543287a 100644 --- a/hw/xfree86/ramdac/IBM.h +++ b/hw/xfree86/ramdac/IBM.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.h,v 1.7 1999/02/12 22:52:11 hohndel Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <xf86RamDac.h> RamDacHelperRecPtr IBMramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs); diff --git a/hw/xfree86/ramdac/IBMPriv.h b/hw/xfree86/ramdac/IBMPriv.h index 1a2bf2065..994296517 100644 --- a/hw/xfree86/ramdac/IBMPriv.h +++ b/hw/xfree86/ramdac/IBMPriv.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBMPriv.h,v 1.1.2.2 1998/07/18 17:54:01 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "IBM.h" typedef struct { diff --git a/hw/xfree86/ramdac/TI.c b/hw/xfree86/ramdac/TI.c index 024cb49eb..e945dab10 100644 --- a/hw/xfree86/ramdac/TI.c +++ b/hw/xfree86/ramdac/TI.c @@ -26,6 +26,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.c,v 1.7 2003/02/17 16:08:29 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ramdac/TI.h b/hw/xfree86/ramdac/TI.h index f33247cfc..05fabb4b2 100644 --- a/hw/xfree86/ramdac/TI.h +++ b/hw/xfree86/ramdac/TI.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.h,v 1.4 2000/05/02 21:04:46 alanh Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <xf86RamDac.h> unsigned long TIramdacCalculateMNPForClock(unsigned long RefClock, diff --git a/hw/xfree86/ramdac/TIPriv.h b/hw/xfree86/ramdac/TIPriv.h index 81fe844a1..d66149dcf 100644 --- a/hw/xfree86/ramdac/TIPriv.h +++ b/hw/xfree86/ramdac/TIPriv.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TIPriv.h,v 1.2 1998/07/25 16:57:19 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "TI.h" typedef struct { diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c index eedb00377..f8efa8f71 100644 --- a/hw/xfree86/ramdac/xf86Cursor.c +++ b/hw/xfree86/ramdac/xf86Cursor.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c,v 1.19tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_ansic.h" #include "xf86CursorPriv.h" diff --git a/hw/xfree86/ramdac/xf86Cursor.h b/hw/xfree86/ramdac/xf86Cursor.h index ac88f4e5f..ff5a7c745 100644 --- a/hw/xfree86/ramdac/xf86Cursor.h +++ b/hw/xfree86/ramdac/xf86Cursor.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.h,v 1.10tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86CURSOR_H #define _XF86CURSOR_H diff --git a/hw/xfree86/ramdac/xf86CursorPriv.h b/hw/xfree86/ramdac/xf86CursorPriv.h index 603f8ecd0..cbe62546b 100644 --- a/hw/xfree86/ramdac/xf86CursorPriv.h +++ b/hw/xfree86/ramdac/xf86CursorPriv.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86CursorPriv.h,v 1.4tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86CURSORPRIV_H #define _XF86CURSORPRIV_H diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c index 675fce09c..527638fac 100644 --- a/hw/xfree86/ramdac/xf86HWCurs.c +++ b/hw/xfree86/ramdac/xf86HWCurs.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86HWCurs.c,v 1.12 2003/02/13 20:28:41 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ramdac/xf86RamDac.c b/hw/xfree86/ramdac/xf86RamDac.c index 7821e591c..1182a3e39 100644 --- a/hw/xfree86/ramdac/xf86RamDac.c +++ b/hw/xfree86/ramdac/xf86RamDac.c @@ -25,6 +25,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.c,v 1.6tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_OSproc.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/ramdac/xf86RamDac.h b/hw/xfree86/ramdac/xf86RamDac.h index 319a7b577..92795a89a 100644 --- a/hw/xfree86/ramdac/xf86RamDac.h +++ b/hw/xfree86/ramdac/xf86RamDac.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.h,v 1.9 1999/03/28 15:33:02 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86RAMDAC_H #define _XF86RAMDAC_H 1 diff --git a/hw/xfree86/ramdac/xf86RamDacCmap.c b/hw/xfree86/ramdac/xf86RamDacCmap.c index b33ea8de0..6a59b4bb7 100644 --- a/hw/xfree86/ramdac/xf86RamDacCmap.c +++ b/hw/xfree86/ramdac/xf86RamDacCmap.c @@ -25,6 +25,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacCmap.c,v 1.6 2000/03/21 21:15:28 alanh Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "windowstr.h" diff --git a/hw/xfree86/ramdac/xf86RamDacMod.c b/hw/xfree86/ramdac/xf86RamDacMod.c index 0fe5ce6aa..d87defc16 100644 --- a/hw/xfree86/ramdac/xf86RamDacMod.c +++ b/hw/xfree86/ramdac/xf86RamDacMod.c @@ -25,6 +25,10 @@ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacMod.c,v 1.5 1999/01/17 10:54:13 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86Module.h" diff --git a/hw/xfree86/ramdac/xf86RamDacPriv.h b/hw/xfree86/ramdac/xf86RamDacPriv.h index 45680a05b..ae5fc72c5 100644 --- a/hw/xfree86/ramdac/xf86RamDacPriv.h +++ b/hw/xfree86/ramdac/xf86RamDacPriv.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacPriv.h,v 1.3 1998/12/06 06:08:37 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86RamDac.h" #include "xf86cmap.h" diff --git a/hw/xfree86/scanpci/xf86PciData.h b/hw/xfree86/scanpci/xf86PciData.h index 2253de8e5..0533d78ec 100644 --- a/hw/xfree86/scanpci/xf86PciData.h +++ b/hw/xfree86/scanpci/xf86PciData.h @@ -27,6 +27,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef PCI_DATA_H_ #define PCI_DATA_H_ diff --git a/hw/xfree86/scanpci/xf86PciStdIds.h b/hw/xfree86/scanpci/xf86PciStdIds.h index e2e6f65a3..14697fe46 100644 --- a/hw/xfree86/scanpci/xf86PciStdIds.h +++ b/hw/xfree86/scanpci/xf86PciStdIds.h @@ -19,6 +19,10 @@ * copyright notice. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86PciInfo.h" #ifndef NULL #define NULL (void *)0 diff --git a/hw/xfree86/scanpci/xf86PciStr.h b/hw/xfree86/scanpci/xf86PciStr.h index bb36d510a..307dfacdf 100644 --- a/hw/xfree86/scanpci/xf86PciStr.h +++ b/hw/xfree86/scanpci/xf86PciStr.h @@ -31,6 +31,10 @@ * to the scanpci and pcidata modules. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XF86_PCISTR_H #define _XF86_PCISTR_H diff --git a/hw/xfree86/scanpci/xf86ScanPci.c b/hw/xfree86/scanpci/xf86ScanPci.c index 4a82e6511..1daebdc5f 100644 --- a/hw/xfree86/scanpci/xf86ScanPci.c +++ b/hw/xfree86/scanpci/xf86ScanPci.c @@ -51,6 +51,10 @@ /* XXX This is including a lot of stuff that modules should not include! */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "xf86.h" diff --git a/hw/xfree86/scanpci/xf86ScanPci.h b/hw/xfree86/scanpci/xf86ScanPci.h index 3a154174a..9107b9e32 100644 --- a/hw/xfree86/scanpci/xf86ScanPci.h +++ b/hw/xfree86/scanpci/xf86ScanPci.h @@ -26,6 +26,10 @@ * authorization from the copyright holder(s) and author(s). */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef SCANPCI_H_ #define SCANPCI_H_ diff --git a/hw/xfree86/shadowfb/sfbmodule.c b/hw/xfree86/shadowfb/sfbmodule.c index 6793c8f95..663f587c4 100644 --- a/hw/xfree86/shadowfb/sfbmodule.c +++ b/hw/xfree86/shadowfb/sfbmodule.c @@ -1,6 +1,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/sfbmodule.c,v 1.1 1999/01/31 12:38:06 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c index 960aa8af7..4363ad0f9 100644 --- a/hw/xfree86/shadowfb/shadow.c +++ b/hw/xfree86/shadowfb/shadow.c @@ -8,18 +8,22 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadow.c,v 1.20tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> #include "pixmapstr.h" #include "input.h" -#include "font.h" +#include <X11/fonts/font.h> #include "mi.h" #include "scrnintstr.h" #include "windowstr.h" #include "gcstruct.h" #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "xf86.h" #include "xf86str.h" #include "shadowfb.h" diff --git a/hw/xfree86/shadowfb/shadowfb.h b/hw/xfree86/shadowfb/shadowfb.h index e42822600..d177c5f1b 100644 --- a/hw/xfree86/shadowfb/shadowfb.h +++ b/hw/xfree86/shadowfb/shadowfb.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadowfb.h,v 1.3 2002/10/16 22:12:54 alanh Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _SHADOWFB_H #define _SHADOWFB_H diff --git a/hw/xfree86/utils/xorgcfg/loader.h b/hw/xfree86/utils/xorgcfg/loader.h index c1a317587..5066b753d 100644 --- a/hw/xfree86/utils/xorgcfg/loader.h +++ b/hw/xfree86/utils/xorgcfg/loader.h @@ -47,7 +47,7 @@ #define XINPUT #include "xf86Xinput.h" -#include "fontmod.h" +#include <X11/fonts/fontmod.h> #include "loaderProcs.h" #include <sym.h> diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c index 7b55c1398..b69a82b4e 100644 --- a/hw/xfree86/vbe/vbe.c +++ b/hw/xfree86/vbe/vbe.c @@ -10,6 +10,10 @@ * Authors: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_ansic.h" #include "vbe.h" diff --git a/hw/xfree86/vbe/vbe.h b/hw/xfree86/vbe/vbe.h index 32515462e..14e8f1a1a 100644 --- a/hw/xfree86/vbe/vbe.h +++ b/hw/xfree86/vbe/vbe.h @@ -10,6 +10,10 @@ * Authors: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _VBE_H #define _VBE_H #include "xf86int10.h" diff --git a/hw/xfree86/vbe/vbeModes.c b/hw/xfree86/vbe/vbeModes.c index c7169dd8f..678f8e120 100644 --- a/hw/xfree86/vbe/vbeModes.c +++ b/hw/xfree86/vbe/vbeModes.c @@ -30,6 +30,10 @@ * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c,v 1.3tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86_ansic.h" #include "vbe.h" diff --git a/hw/xfree86/vbe/vbeModes.h b/hw/xfree86/vbe/vbeModes.h index 2a8d1b33a..a716f26be 100644 --- a/hw/xfree86/vbe/vbeModes.h +++ b/hw/xfree86/vbe/vbeModes.h @@ -29,6 +29,10 @@ * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbeModes.h,v 1.1 2002/08/06 13:46:28 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _VBE_MODES_H /* diff --git a/hw/xfree86/vbe/vbe_module.c b/hw/xfree86/vbe/vbe_module.c index d6f49a5c8..5e3a193b1 100644 --- a/hw/xfree86/vbe/vbe_module.c +++ b/hw/xfree86/vbe/vbe_module.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbe_module.c,v 1.4 2002/09/16 18:06:15 eich Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf86.h" #include "xf86str.h" #include "vbe.h" diff --git a/hw/xfree86/vgahw/vgaCmap.c b/hw/xfree86/vgahw/vgaCmap.c index d73c04300..85f8bbdb8 100644 --- a/hw/xfree86/vgahw/vgaCmap.c +++ b/hw/xfree86/vgahw/vgaCmap.c @@ -24,6 +24,10 @@ /* $XConsortium: vgaCmap.c /main/15 1996/10/28 05:13:44 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "windowstr.h" diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c index fb0e65b7e..07a41d128 100644 --- a/hw/xfree86/vgahw/vgaHW.c +++ b/hw/xfree86/vgahw/vgaHW.c @@ -12,6 +12,10 @@ #define _NEED_SYSI86 +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h index 14dbb4be3..568d45093 100644 --- a/hw/xfree86/vgahw/vgaHW.h +++ b/hw/xfree86/vgahw/vgaHW.h @@ -11,6 +11,10 @@ * Author: Dirk Hohndel */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _VGAHW_H #define _VGAHW_H diff --git a/hw/xfree86/vgahw/vgaHWmodule.c b/hw/xfree86/vgahw/vgaHWmodule.c index d6044bbb7..9f5a5a9c2 100644 --- a/hw/xfree86/vgahw/vgaHWmodule.c +++ b/hw/xfree86/vgahw/vgaHWmodule.c @@ -4,6 +4,10 @@ * Copyright 1998 by The XFree86 Project, Inc */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/xaa/xaa.h b/hw/xfree86/xaa/xaa.h index d4ff7bbd8..fb31fc172 100644 --- a/hw/xfree86/xaa/xaa.h +++ b/hw/xfree86/xaa/xaa.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaa.h,v 1.38 2002/10/21 01:54:04 mvojkovi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XAA_H #define _XAA_H diff --git a/hw/xfree86/xaa/xaaBitBlt.c b/hw/xfree86/xaa/xaaBitBlt.c index 5e2965ca9..73aab81cd 100644 --- a/hw/xfree86/xaa/xaaBitBlt.c +++ b/hw/xfree86/xaa/xaaBitBlt.c @@ -7,6 +7,10 @@ to the fg and bg so CopyPlane can use this. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaBitOrder.c b/hw/xfree86/xaa/xaaBitOrder.c index 7772f3387..eda0b02ca 100644 --- a/hw/xfree86/xaa/xaaBitOrder.c +++ b/hw/xfree86/xaa/xaaBitOrder.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c,v 1.7 2001/05/18 20:22:31 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/Xmd.h> CARD32 XAAReverseBitOrder(CARD32 v); diff --git a/hw/xfree86/xaa/xaaBitmap.c b/hw/xfree86/xaa/xaaBitmap.c index 272b9fb42..b3f00d696 100644 --- a/hw/xfree86/xaa/xaaBitmap.c +++ b/hw/xfree86/xaa/xaaBitmap.c @@ -1,6 +1,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitmap.c,v 1.9 2000/06/29 10:55:41 alanh Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xaa.h" #include "xaalocal.h" #include "xaacexp.h" diff --git a/hw/xfree86/xaa/xaaCpyArea.c b/hw/xfree86/xaa/xaaCpyArea.c index 5bf4c9858..45e3b6e4a 100644 --- a/hw/xfree86/xaa/xaaCpyArea.c +++ b/hw/xfree86/xaa/xaaCpyArea.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c,v 1.12 2000/09/28 20:47:59 mvojkovi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaCpyPlane.c b/hw/xfree86/xaa/xaaCpyPlane.c index b614a8afb..5d2af7584 100644 --- a/hw/xfree86/xaa/xaaCpyPlane.c +++ b/hw/xfree86/xaa/xaaCpyPlane.c @@ -10,6 +10,10 @@ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaCpyWin.c b/hw/xfree86/xaa/xaaCpyWin.c index 13b1a6d05..d35434a18 100644 --- a/hw/xfree86/xaa/xaaCpyWin.c +++ b/hw/xfree86/xaa/xaaCpyWin.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyWin.c,v 1.3tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaDashLine.c b/hw/xfree86/xaa/xaaDashLine.c index de9bd2b92..a2ba8f590 100644 --- a/hw/xfree86/xaa/xaaDashLine.c +++ b/hw/xfree86/xaa/xaaDashLine.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c,v 1.4 2001/10/28 03:34:04 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaFallback.c b/hw/xfree86/xaa/xaaFallback.c index fe73aef62..3fca17cbb 100644 --- a/hw/xfree86/xaa/xaaFallback.c +++ b/hw/xfree86/xaa/xaaFallback.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c,v 1.4 1999/03/14 11:18:09 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaFillArc.c b/hw/xfree86/xaa/xaaFillArc.c index 699491f66..43a351e22 100644 --- a/hw/xfree86/xaa/xaaFillArc.c +++ b/hw/xfree86/xaa/xaaFillArc.c @@ -34,6 +34,10 @@ * * Clipped arcs are dispatched to FillSpans. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaFillPoly.c b/hw/xfree86/xaa/xaaFillPoly.c index 0cf273c5b..1136cbc8f 100644 --- a/hw/xfree86/xaa/xaaFillPoly.c +++ b/hw/xfree86/xaa/xaaFillPoly.c @@ -31,6 +31,10 @@ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaFillRect.c b/hw/xfree86/xaa/xaaFillRect.c index b7178b9af..d459e979c 100644 --- a/hw/xfree86/xaa/xaaFillRect.c +++ b/hw/xfree86/xaa/xaaFillRect.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c,v 1.15tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c index 207a12668..451ade394 100644 --- a/hw/xfree86/xaa/xaaGC.c +++ b/hw/xfree86/xaa/xaaGC.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGC.c,v 1.18 2000/09/28 20:48:00 mvojkovi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaGCmisc.c b/hw/xfree86/xaa/xaaGCmisc.c index d7e6d4d52..24a916bd6 100644 --- a/hw/xfree86/xaa/xaaGCmisc.c +++ b/hw/xfree86/xaa/xaaGCmisc.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c,v 1.14 2000/05/03 00:44:23 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" @@ -7,7 +11,7 @@ #include <X11/X.h> #include "scrnintstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "xf86str.h" #include "xaa.h" diff --git a/hw/xfree86/xaa/xaaImage.c b/hw/xfree86/xaa/xaaImage.c index 6faa7685e..5de432fed 100644 --- a/hw/xfree86/xaa/xaaImage.c +++ b/hw/xfree86/xaa/xaaImage.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c,v 1.20tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c index 090436b9b..ca53aaf7a 100644 --- a/hw/xfree86/xaa/xaaInit.c +++ b/hw/xfree86/xaa/xaaInit.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c,v 1.34 2001/07/19 14:19:42 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c index a17b152da..9016c6127 100644 --- a/hw/xfree86/xaa/xaaInitAccel.c +++ b/hw/xfree86/xaa/xaaInitAccel.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInitAccel.c,v 1.35tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaLine.c b/hw/xfree86/xaa/xaaLine.c index 2f9bdb759..be1feb4fd 100644 --- a/hw/xfree86/xaa/xaaLine.c +++ b/hw/xfree86/xaa/xaaLine.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c,v 1.5 2001/10/28 03:34:04 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaLineMisc.c b/hw/xfree86/xaa/xaaLineMisc.c index 4c9b01018..e8a28d5d0 100644 --- a/hw/xfree86/xaa/xaaLineMisc.c +++ b/hw/xfree86/xaa/xaaLineMisc.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLineMisc.c,v 1.4 1998/09/27 04:43:45 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaNonTEGlyph.c b/hw/xfree86/xaa/xaaNonTEGlyph.c index 514a8cf42..75318e51c 100644 --- a/hw/xfree86/xaa/xaaNonTEGlyph.c +++ b/hw/xfree86/xaa/xaaNonTEGlyph.c @@ -1,6 +1,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEGlyph.c,v 1.4 1998/09/13 05:23:55 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xaa.h" #include "xaalocal.h" #include "xaacexp.h" diff --git a/hw/xfree86/xaa/xaaNonTEText.c b/hw/xfree86/xaa/xaaNonTEText.c index 4882f76a6..0c17a4abf 100644 --- a/hw/xfree86/xaa/xaaNonTEText.c +++ b/hw/xfree86/xaa/xaaNonTEText.c @@ -18,13 +18,17 @@ ********************************************************************/ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> -#include "font.h" +#include <X11/fonts/font.h> #include "scrnintstr.h" #include "dixfontstr.h" #include "xf86str.h" diff --git a/hw/xfree86/xaa/xaaOffscreen.c b/hw/xfree86/xaa/xaaOffscreen.c index 53d0eb841..fbe029f92 100644 --- a/hw/xfree86/xaa/xaaOffscreen.c +++ b/hw/xfree86/xaa/xaaOffscreen.c @@ -7,6 +7,10 @@ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaOverlay.c b/hw/xfree86/xaa/xaaOverlay.c index 044e727ee..48968c41f 100644 --- a/hw/xfree86/xaa/xaaOverlay.c +++ b/hw/xfree86/xaa/xaaOverlay.c @@ -1,6 +1,10 @@ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.3 2005/04/20 12:25:39 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.14tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaOverlayDF.c b/hw/xfree86/xaa/xaaOverlayDF.c index 7f5923e42..359e4d4a6 100644 --- a/hw/xfree86/xaa/xaaOverlayDF.c +++ b/hw/xfree86/xaa/xaaOverlayDF.c @@ -6,6 +6,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlayDF.c,v 1.1tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaPCache.c b/hw/xfree86/xaa/xaaPCache.c index 718a99275..139fb7b81 100644 --- a/hw/xfree86/xaa/xaaPCache.c +++ b/hw/xfree86/xaa/xaaPCache.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v 1.32tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaPaintWin.c b/hw/xfree86/xaa/xaaPaintWin.c index abe1bbb07..cde39d9ea 100644 --- a/hw/xfree86/xaa/xaaPaintWin.c +++ b/hw/xfree86/xaa/xaaPaintWin.c @@ -1,6 +1,10 @@ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.3 2005/04/20 12:25:39 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.10 2001/10/28 03:34:04 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaPict.c b/hw/xfree86/xaa/xaaPict.c index a80388eae..b12750421 100644 --- a/hw/xfree86/xaa/xaaPict.c +++ b/hw/xfree86/xaa/xaaPict.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaROP.c b/hw/xfree86/xaa/xaaROP.c index 0f39db96d..f9fe04d1c 100644 --- a/hw/xfree86/xaa/xaaROP.c +++ b/hw/xfree86/xaa/xaaROP.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "xf86.h" diff --git a/hw/xfree86/xaa/xaaRect.c b/hw/xfree86/xaa/xaaRect.c index 8a7d73a33..9bbecae8b 100644 --- a/hw/xfree86/xaa/xaaRect.c +++ b/hw/xfree86/xaa/xaaRect.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaRect.c,v 1.2 1998/07/25 16:58:51 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaSpans.c b/hw/xfree86/xaa/xaaSpans.c index 113be1536..a1de98c0a 100644 --- a/hw/xfree86/xaa/xaaSpans.c +++ b/hw/xfree86/xaa/xaaSpans.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c,v 1.14 2000/03/28 01:21:05 mvojkovi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaStateChange.c b/hw/xfree86/xaa/xaaStateChange.c index a78ed3758..480462588 100644 --- a/hw/xfree86/xaa/xaaStateChange.c +++ b/hw/xfree86/xaa/xaaStateChange.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c,v 3.1 2000/06/20 05:08:49 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xaa/xaaStipple.c b/hw/xfree86/xaa/xaaStipple.c index 66d3a81e3..02a2b32ce 100644 --- a/hw/xfree86/xaa/xaaStipple.c +++ b/hw/xfree86/xaa/xaaStipple.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStipple.c,v 1.11 2001/10/28 03:34:04 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xaa.h" #include "xaalocal.h" #include "xaacexp.h" diff --git a/hw/xfree86/xaa/xaaTEGlyph.c b/hw/xfree86/xaa/xaaTEGlyph.c index 7a699fd1f..187a9dc61 100644 --- a/hw/xfree86/xaa/xaaTEGlyph.c +++ b/hw/xfree86/xaa/xaaTEGlyph.c @@ -1,6 +1,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c,v 1.7 1999/11/06 23:14:46 mvojkovi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xaa.h" #include "xaalocal.h" #include "xaacexp.h" diff --git a/hw/xfree86/xaa/xaaTEText.c b/hw/xfree86/xaa/xaaTEText.c index a4298ddda..3079c6db5 100644 --- a/hw/xfree86/xaa/xaaTEText.c +++ b/hw/xfree86/xaa/xaaTEText.c @@ -18,13 +18,17 @@ ********************************************************************/ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" #include "xf86_OSproc.h" #include <X11/X.h> -#include "font.h" +#include <X11/fonts/font.h> #include "scrnintstr.h" #include "dixfontstr.h" #include "xf86str.h" diff --git a/hw/xfree86/xaa/xaaWideLine.c b/hw/xfree86/xaa/xaaWideLine.c index 866464854..8e0e5d828 100644 --- a/hw/xfree86/xaa/xaaWideLine.c +++ b/hw/xfree86/xaa/xaaWideLine.c @@ -14,6 +14,10 @@ Original mi code written by Keith Packard. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef XFree86LOADER #if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \ || (defined(sun) && defined(__SVR4)) diff --git a/hw/xfree86/xaa/xaaWrapper.c b/hw/xfree86/xaa/xaaWrapper.c index 7ec3dcf7f..5b525684a 100644 --- a/hw/xfree86/xaa/xaaWrapper.c +++ b/hw/xfree86/xaa/xaaWrapper.c @@ -1,3 +1,7 @@ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "scrnintstr.h" diff --git a/hw/xfree86/xaa/xaaWrapper.h b/hw/xfree86/xaa/xaaWrapper.h index fbcf17f6f..9f413f4f7 100644 --- a/hw/xfree86/xaa/xaaWrapper.h +++ b/hw/xfree86/xaa/xaaWrapper.h @@ -1,3 +1,7 @@ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XAA_WRAPPER_H # define _XAA_WRAPPER_H diff --git a/hw/xfree86/xaa/xaacexp.h b/hw/xfree86/xaa/xaacexp.h index 2f75b7e32..9decdc594 100644 --- a/hw/xfree86/xaa/xaacexp.h +++ b/hw/xfree86/xaa/xaacexp.h @@ -1,6 +1,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h,v 1.3 2000/01/21 02:30:06 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/Xarch.h> #ifndef FIXEDBASE diff --git a/hw/xfree86/xaa/xaalocal.h b/hw/xfree86/xaa/xaalocal.h index 883e64d5b..e01fa7894 100644 --- a/hw/xfree86/xaa/xaalocal.h +++ b/hw/xfree86/xaa/xaalocal.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaalocal.h,v 1.36tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XAALOCAL_H #define _XAALOCAL_H diff --git a/hw/xfree86/xaa/xaarop.h b/hw/xfree86/xaa/xaarop.h index 1c95727b3..e3f540516 100644 --- a/hw/xfree86/xaa/xaarop.h +++ b/hw/xfree86/xaa/xaarop.h @@ -29,6 +29,10 @@ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _XAAROP_H #define _XAAROP_H diff --git a/hw/xfree86/xaa/xaawrap.h b/hw/xfree86/xaa/xaawrap.h index 5e3e0e683..3ba0c1699 100644 --- a/hw/xfree86/xaa/xaawrap.h +++ b/hw/xfree86/xaa/xaawrap.h @@ -58,6 +58,10 @@ pGC->ops = &XAAPixmapOps;\ pixPriv->flags |= DIRTY +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef RENDER #define XAA_RENDER_PROLOGUE(pScreen,field)\ (GetPictureScreen(pScreen)->field = \ diff --git a/hw/xfree86/xf1bpp/mfbmap.h b/hw/xfree86/xf1bpp/mfbmap.h index 12695003c..832c72720 100644 --- a/hw/xfree86/xf1bpp/mfbmap.h +++ b/hw/xfree86/xf1bpp/mfbmap.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h,v 1.1.2.2 1998/06/08 15:13:15 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _MFBMAP_H #define _MFBMAP_H diff --git a/hw/xfree86/xf1bpp/mfbmodule.c b/hw/xfree86/xf1bpp/mfbmodule.c index 81baf5d7e..50715ccc1 100644 --- a/hw/xfree86/xf1bpp/mfbmodule.c +++ b/hw/xfree86/xf1bpp/mfbmodule.c @@ -25,6 +25,10 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/xf1bpp/mfbunmap.h b/hw/xfree86/xf1bpp/mfbunmap.h index 454091538..24c3262b7 100644 --- a/hw/xfree86/xf1bpp/mfbunmap.h +++ b/hw/xfree86/xf1bpp/mfbunmap.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.h,v 1.1.2.1 1998/06/27 14:48:24 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef _MFBMAP_H #undef _MFBMAP_H diff --git a/hw/xfree86/xf1bpp/xf1bpp.h b/hw/xfree86/xf1bpp/xf1bpp.h index 18104a77e..885358bb5 100644 --- a/hw/xfree86/xf1bpp/xf1bpp.h +++ b/hw/xfree86/xf1bpp/xf1bpp.h @@ -25,6 +25,10 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef __XF1BPP_H__ #define __XF1BPP_H__ diff --git a/hw/xfree86/xf4bpp/OScompiler.h b/hw/xfree86/xf4bpp/OScompiler.h index 9c99b1c85..0e70d6354 100644 --- a/hw/xfree86/xf4bpp/OScompiler.h +++ b/hw/xfree86/xf4bpp/OScompiler.h @@ -23,6 +23,10 @@ */ /* $XConsortium: OScompiler.h /main/4 1996/02/21 17:56:09 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef __COMPILER_DEPENDANCIES__ #define __COMPILER_DEPENDANCIES__ diff --git a/hw/xfree86/xf4bpp/emulOpStip.c b/hw/xfree86/xf4bpp/emulOpStip.c index 4a347b5d1..2f63b1435 100644 --- a/hw/xfree86/xf4bpp/emulOpStip.c +++ b/hw/xfree86/xf4bpp/emulOpStip.c @@ -30,6 +30,10 @@ * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" diff --git a/hw/xfree86/xf4bpp/emulRepAre.c b/hw/xfree86/xf4bpp/emulRepAre.c index a7f115682..9ae62149f 100644 --- a/hw/xfree86/xf4bpp/emulRepAre.c +++ b/hw/xfree86/xf4bpp/emulRepAre.c @@ -28,6 +28,10 @@ * P. Shupak 1/88 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" void xf4bppReplicateArea( pWin, x, y, planeMask, goalWidth, goalHeight, diff --git a/hw/xfree86/xf4bpp/emulTile.c b/hw/xfree86/xf4bpp/emulTile.c index 1e2d095ee..c4f15cad6 100644 --- a/hw/xfree86/xf4bpp/emulTile.c +++ b/hw/xfree86/xf4bpp/emulTile.c @@ -30,6 +30,10 @@ * Uses private imageFill a bunch of times */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "ibmTrace.h" diff --git a/hw/xfree86/xf4bpp/mfbbres.c b/hw/xfree86/xf4bpp/mfbbres.c index ae9df6e10..b54e23965 100644 --- a/hw/xfree86/xf4bpp/mfbbres.c +++ b/hw/xfree86/xf4bpp/mfbbres.c @@ -50,6 +50,10 @@ SOFTWARE. /* GJA -- modified this file for vga16 */ /* $XConsortium: mfbbres.c /main/5 1996/02/21 17:56:30 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" diff --git a/hw/xfree86/xf4bpp/mfbbresd.c b/hw/xfree86/xf4bpp/mfbbresd.c index 0f320ebc6..d28a6c2a3 100644 --- a/hw/xfree86/xf4bpp/mfbbresd.c +++ b/hw/xfree86/xf4bpp/mfbbresd.c @@ -49,6 +49,10 @@ SOFTWARE. /* GJA -- modified this file for vga16 */ /* $XConsortium: mfbbresd.c /main/5 1996/02/21 17:56:34 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" diff --git a/hw/xfree86/xf4bpp/mfbfillarc.c b/hw/xfree86/xf4bpp/mfbfillarc.c index c3f62cb64..e2cab12f5 100644 --- a/hw/xfree86/xf4bpp/mfbfillarc.c +++ b/hw/xfree86/xf4bpp/mfbfillarc.c @@ -30,6 +30,10 @@ in this Software without prior written authorization from the X Consortium. /* $XConsortium: mfbfillarc.c /main/4 1996/02/21 17:56:37 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" diff --git a/hw/xfree86/xf4bpp/mfbhrzvert.c b/hw/xfree86/xf4bpp/mfbhrzvert.c index 0e5594356..eb510c0fb 100644 --- a/hw/xfree86/xf4bpp/mfbhrzvert.c +++ b/hw/xfree86/xf4bpp/mfbhrzvert.c @@ -50,6 +50,10 @@ SOFTWARE. /* GJA -- modified this file for vga16 */ /* $XConsortium: mfbhrzvert.c /main/3 1996/02/21 17:56:41 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" diff --git a/hw/xfree86/xf4bpp/mfbimggblt.c b/hw/xfree86/xf4bpp/mfbimggblt.c index 95d7a7fcb..03107bbf3 100644 --- a/hw/xfree86/xf4bpp/mfbimggblt.c +++ b/hw/xfree86/xf4bpp/mfbimggblt.c @@ -50,6 +50,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: mfbimggblt.c /main/5 1996/02/21 17:56:44 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" diff --git a/hw/xfree86/xf4bpp/mfbline.c b/hw/xfree86/xf4bpp/mfbline.c index 356028b8c..6d85f68c1 100644 --- a/hw/xfree86/xf4bpp/mfbline.c +++ b/hw/xfree86/xf4bpp/mfbline.c @@ -49,6 +49,10 @@ SOFTWARE. /* GJA -- modified this file for vga16 */ /* $XConsortium: mfbline.c /main/4 1996/02/21 17:56:48 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" diff --git a/hw/xfree86/xf4bpp/mfbzerarc.c b/hw/xfree86/xf4bpp/mfbzerarc.c index 4853f8807..54aa3b0c9 100644 --- a/hw/xfree86/xf4bpp/mfbzerarc.c +++ b/hw/xfree86/xf4bpp/mfbzerarc.c @@ -36,6 +36,10 @@ in this Software without prior written authorization from the X Consortium. * The Computer Journal, November 1967, Volume 10, Number 3, pp. 282-289 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" diff --git a/hw/xfree86/xf4bpp/offscreen.c b/hw/xfree86/xf4bpp/offscreen.c index e684bf118..1bf634c80 100644 --- a/hw/xfree86/xf4bpp/offscreen.c +++ b/hw/xfree86/xf4bpp/offscreen.c @@ -43,6 +43,10 @@ */ /* $XConsortium: offscreen.c /main/4 1996/02/21 17:56:55 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "vgaVideo.h" #include "pixmapstr.h" diff --git a/hw/xfree86/xf4bpp/ppcArea.c b/hw/xfree86/xf4bpp/ppcArea.c index 663672878..56cab0d64 100644 --- a/hw/xfree86/xf4bpp/ppcArea.c +++ b/hw/xfree86/xf4bpp/ppcArea.c @@ -29,6 +29,10 @@ * Tom Paquin 8/87 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/ppcBStore.c b/hw/xfree86/xf4bpp/ppcBStore.c index 295f52159..7686b6f9b 100644 --- a/hw/xfree86/xf4bpp/ppcBStore.c +++ b/hw/xfree86/xf4bpp/ppcBStore.c @@ -62,6 +62,10 @@ software without specific, written prior permission. */ /* $XConsortium: ppcBStore.c /main/5 1996/02/21 17:57:06 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "vgaVideo.h" #include "ibmTrace.h" diff --git a/hw/xfree86/xf4bpp/ppcCReduce.c b/hw/xfree86/xf4bpp/ppcCReduce.c index aef3c2dd5..f937aac34 100644 --- a/hw/xfree86/xf4bpp/ppcCReduce.c +++ b/hw/xfree86/xf4bpp/ppcCReduce.c @@ -24,6 +24,10 @@ /* $XConsortium: ppcCReduce.c /main/3 1996/02/21 17:57:17 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "ppcGCstr.h" diff --git a/hw/xfree86/xf4bpp/ppcClip.c b/hw/xfree86/xf4bpp/ppcClip.c index 87b387176..fe690555f 100644 --- a/hw/xfree86/xf4bpp/ppcClip.c +++ b/hw/xfree86/xf4bpp/ppcClip.c @@ -70,6 +70,10 @@ SOFTWARE. */ /* $XConsortium: ppcClip.c /main/4 1996/02/21 17:57:21 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/ppcCpArea.c b/hw/xfree86/xf4bpp/ppcCpArea.c index c6df4ef41..4673fe7ac 100644 --- a/hw/xfree86/xf4bpp/ppcCpArea.c +++ b/hw/xfree86/xf4bpp/ppcCpArea.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #define PSZ 8 diff --git a/hw/xfree86/xf4bpp/ppcDepth.c b/hw/xfree86/xf4bpp/ppcDepth.c index 5c3aff6f6..8a67cdd30 100644 --- a/hw/xfree86/xf4bpp/ppcDepth.c +++ b/hw/xfree86/xf4bpp/ppcDepth.c @@ -30,6 +30,10 @@ * */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "scrnintstr.h" diff --git a/hw/xfree86/xf4bpp/ppcFillRct.c b/hw/xfree86/xf4bpp/ppcFillRct.c index ec9032e57..28c7acb6c 100644 --- a/hw/xfree86/xf4bpp/ppcFillRct.c +++ b/hw/xfree86/xf4bpp/ppcFillRct.c @@ -49,6 +49,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: ppcFillRct.c /main/5 1996/02/21 17:57:35 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/ppcGC.c b/hw/xfree86/xf4bpp/ppcGC.c index 881dfbf05..9877b4bba 100644 --- a/hw/xfree86/xf4bpp/ppcGC.c +++ b/hw/xfree86/xf4bpp/ppcGC.c @@ -71,6 +71,10 @@ SOFTWARE. /* $XConsortium: ppcGC.c /main/6 1996/02/21 17:57:38 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/ppcGCstr.h b/hw/xfree86/xf4bpp/ppcGCstr.h index 78273ca23..12a573c9d 100644 --- a/hw/xfree86/xf4bpp/ppcGCstr.h +++ b/hw/xfree86/xf4bpp/ppcGCstr.h @@ -45,6 +45,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: ppcGCstr.h /main/3 1996/02/21 17:57:42 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "gc.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/ppcGetSp.c b/hw/xfree86/xf4bpp/ppcGetSp.c index 00cd985a7..43f626f70 100644 --- a/hw/xfree86/xf4bpp/ppcGetSp.c +++ b/hw/xfree86/xf4bpp/ppcGetSp.c @@ -72,6 +72,10 @@ SOFTWARE. /* $XConsortium: ppcGetSp.c /main/5 1996/02/21 17:57:45 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" diff --git a/hw/xfree86/xf4bpp/ppcIO.c b/hw/xfree86/xf4bpp/ppcIO.c index 6b6fb1c09..67eadfbf0 100644 --- a/hw/xfree86/xf4bpp/ppcIO.c +++ b/hw/xfree86/xf4bpp/ppcIO.c @@ -50,6 +50,10 @@ SOFTWARE. */ /* $XConsortium: ppcIO.c /main/8 1996/02/21 17:57:49 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/ppcImg.c b/hw/xfree86/xf4bpp/ppcImg.c index 948359a30..71fcf38b1 100644 --- a/hw/xfree86/xf4bpp/ppcImg.c +++ b/hw/xfree86/xf4bpp/ppcImg.c @@ -24,6 +24,10 @@ /* $XConsortium: ppcImg.c /main/4 1996/02/21 17:57:53 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "mi.h" diff --git a/hw/xfree86/xf4bpp/ppcPixFS.c b/hw/xfree86/xf4bpp/ppcPixFS.c index 957a88135..dd1bb31d9 100644 --- a/hw/xfree86/xf4bpp/ppcPixFS.c +++ b/hw/xfree86/xf4bpp/ppcPixFS.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: ppcPixFS.c /main/3 1996/02/21 17:57:57 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/ppcPixmap.c b/hw/xfree86/xf4bpp/ppcPixmap.c index c3085bc4b..1f66c5850 100644 --- a/hw/xfree86/xf4bpp/ppcPixmap.c +++ b/hw/xfree86/xf4bpp/ppcPixmap.c @@ -71,6 +71,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: ppcPixmap.c /main/5 1996/02/21 17:58:00 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "servermd.h" #include "OScompiler.h" diff --git a/hw/xfree86/xf4bpp/ppcPntWin.c b/hw/xfree86/xf4bpp/ppcPntWin.c index f68dbdc19..11195e033 100644 --- a/hw/xfree86/xf4bpp/ppcPntWin.c +++ b/hw/xfree86/xf4bpp/ppcPntWin.c @@ -71,6 +71,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: ppcPntWin.c /main/5 1996/02/21 17:58:04 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/ppcPolyPnt.c b/hw/xfree86/xf4bpp/ppcPolyPnt.c index 568902925..c78622482 100644 --- a/hw/xfree86/xf4bpp/ppcPolyPnt.c +++ b/hw/xfree86/xf4bpp/ppcPolyPnt.c @@ -70,6 +70,10 @@ SOFTWARE. */ /* $XConsortium: ppcPolyPnt.c /main/5 1996/02/21 17:58:07 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/ppcPolyRec.c b/hw/xfree86/xf4bpp/ppcPolyRec.c index 8bb43eea4..085cb4b25 100644 --- a/hw/xfree86/xf4bpp/ppcPolyRec.c +++ b/hw/xfree86/xf4bpp/ppcPolyRec.c @@ -70,6 +70,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: ppcPolyRec.c /main/4 1996/02/21 17:58:11 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" void diff --git a/hw/xfree86/xf4bpp/ppcQuery.c b/hw/xfree86/xf4bpp/ppcQuery.c index 267eef0ef..95914846d 100644 --- a/hw/xfree86/xf4bpp/ppcQuery.c +++ b/hw/xfree86/xf4bpp/ppcQuery.c @@ -23,6 +23,10 @@ */ /* $XConsortium: ppcQuery.c /main/3 1996/02/21 17:58:18 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" void diff --git a/hw/xfree86/xf4bpp/ppcRslvC.c b/hw/xfree86/xf4bpp/ppcRslvC.c index 47e427755..ce00a8799 100644 --- a/hw/xfree86/xf4bpp/ppcRslvC.c +++ b/hw/xfree86/xf4bpp/ppcRslvC.c @@ -57,6 +57,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. * P. Shupak 12/31/87 */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "scrnintstr.h" diff --git a/hw/xfree86/xf4bpp/ppcSetSp.c b/hw/xfree86/xf4bpp/ppcSetSp.c index 9c3464de1..7d560988a 100644 --- a/hw/xfree86/xf4bpp/ppcSetSp.c +++ b/hw/xfree86/xf4bpp/ppcSetSp.c @@ -71,6 +71,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: ppcSetSp.c /main/5 1996/02/21 17:58:32 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "mfbmap.h" diff --git a/hw/xfree86/xf4bpp/ppcWinFS.c b/hw/xfree86/xf4bpp/ppcWinFS.c index d7fd6b790..820b80e53 100644 --- a/hw/xfree86/xf4bpp/ppcWinFS.c +++ b/hw/xfree86/xf4bpp/ppcWinFS.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $XConsortium: ppcWinFS.c /main/3 1996/02/21 17:58:39 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/ppcWindow.c b/hw/xfree86/xf4bpp/ppcWindow.c index c15962aaf..4cf8ea3cb 100644 --- a/hw/xfree86/xf4bpp/ppcWindow.c +++ b/hw/xfree86/xf4bpp/ppcWindow.c @@ -70,6 +70,10 @@ SOFTWARE. */ /* $XConsortium: ppcWindow.c /main/5 1996/02/21 17:58:43 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/vgaBitBlt.c b/hw/xfree86/xf4bpp/vgaBitBlt.c index dc7b7965a..e13312233 100644 --- a/hw/xfree86/xf4bpp/vgaBitBlt.c +++ b/hw/xfree86/xf4bpp/vgaBitBlt.c @@ -5,6 +5,10 @@ /* $XConsortium: vgaBitBlt.c /main/8 1996/10/27 11:06:39 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "vgaReg.h" diff --git a/hw/xfree86/xf4bpp/vgaGC.c b/hw/xfree86/xf4bpp/vgaGC.c index a1aecafbb..f7a3d9440 100644 --- a/hw/xfree86/xf4bpp/vgaGC.c +++ b/hw/xfree86/xf4bpp/vgaGC.c @@ -71,6 +71,10 @@ SOFTWARE. /* $XConsortium: vgaGC.c /main/6 1996/02/21 17:58:54 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "mfbmap.h" #include "mfb.h" diff --git a/hw/xfree86/xf4bpp/vgaImages.c b/hw/xfree86/xf4bpp/vgaImages.c index a03f21d2b..4806b9461 100644 --- a/hw/xfree86/xf4bpp/vgaImages.c +++ b/hw/xfree86/xf4bpp/vgaImages.c @@ -23,6 +23,10 @@ */ /* $XConsortium: vgaImages.c /main/5 1996/02/21 17:58:58 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "vgaReg.h" diff --git a/hw/xfree86/xf4bpp/vgaReg.h b/hw/xfree86/xf4bpp/vgaReg.h index a3596e6a3..552f07140 100644 --- a/hw/xfree86/xf4bpp/vgaReg.h +++ b/hw/xfree86/xf4bpp/vgaReg.h @@ -35,6 +35,10 @@ SET_BYTE_REGISTER((RegGroup) + 1, Value)) /* There is a jumper on the ega to change this to 0x200 instead !! */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #if 0 /* This is now a stack variable, as needed */ #define REGBASE 0x300 #endif diff --git a/hw/xfree86/xf4bpp/vgaSolid.c b/hw/xfree86/xf4bpp/vgaSolid.c index 6cd15e9f5..5cb47173c 100644 --- a/hw/xfree86/xf4bpp/vgaSolid.c +++ b/hw/xfree86/xf4bpp/vgaSolid.c @@ -24,6 +24,10 @@ /* $XConsortium: vgaSolid.c /main/5 1996/02/21 17:59:06 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "vgaReg.h" diff --git a/hw/xfree86/xf4bpp/vgaStipple.c b/hw/xfree86/xf4bpp/vgaStipple.c index 316b4a49b..a7bfa13d2 100644 --- a/hw/xfree86/xf4bpp/vgaStipple.c +++ b/hw/xfree86/xf4bpp/vgaStipple.c @@ -23,6 +23,10 @@ */ /* $XConsortium: vgaStipple.c /main/5 1996/02/21 17:59:10 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "vgaReg.h" diff --git a/hw/xfree86/xf4bpp/vgaVideo.h b/hw/xfree86/xf4bpp/vgaVideo.h index f9642c0d4..1e613bb30 100644 --- a/hw/xfree86/xf4bpp/vgaVideo.h +++ b/hw/xfree86/xf4bpp/vgaVideo.h @@ -24,6 +24,10 @@ /* $XConsortium: vgaVideo.h /main/4 1996/02/21 17:59:14 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> /* GJA -- for pointer data type */ #ifdef lint #if defined(volatile) diff --git a/hw/xfree86/xf4bpp/vgamodule.c b/hw/xfree86/xf4bpp/vgamodule.c index 828989dd5..932a856c2 100644 --- a/hw/xfree86/xf4bpp/vgamodule.c +++ b/hw/xfree86/xf4bpp/vgamodule.c @@ -25,6 +25,10 @@ * XFree86 Project. */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/xf4bpp/wm3.c b/hw/xfree86/xf4bpp/wm3.c index f3acf8123..6b501b570 100644 --- a/hw/xfree86/xf4bpp/wm3.c +++ b/hw/xfree86/xf4bpp/wm3.c @@ -6,6 +6,10 @@ /* $XConsortium: wm3.c /main/5 1996/02/21 17:59:21 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "xf4bpp.h" #include "OScompiler.h" #include "wm3.h" diff --git a/hw/xfree86/xf4bpp/wm3.h b/hw/xfree86/xf4bpp/wm3.h index 1c7261eb9..1def6f607 100644 --- a/hw/xfree86/xf4bpp/wm3.h +++ b/hw/xfree86/xf4bpp/wm3.h @@ -6,6 +6,10 @@ /* $XConsortium: wm3.h /main/4 1996/02/21 17:59:24 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "vgaReg.h" #ifdef PC98_EGC diff --git a/hw/xfree86/xf4bpp/xf4bpp.h b/hw/xfree86/xf4bpp/xf4bpp.h index 976f27e32..8d6ccb644 100644 --- a/hw/xfree86/xf4bpp/xf4bpp.h +++ b/hw/xfree86/xf4bpp/xf4bpp.h @@ -1,6 +1,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h,v 1.9 2003/11/03 05:11:57 tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef __XF4BPP_H__ #define __XF4BPP_H__ @@ -8,7 +12,7 @@ #include "windowstr.h" #include "gcstruct.h" #include "colormapst.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #ifndef PixelType #define PixelType CARD32 #endif diff --git a/hw/xfree86/xf8_16bpp/cfb8_16.h b/hw/xfree86/xf8_16bpp/cfb8_16.h index 97586ba01..b02000493 100644 --- a/hw/xfree86/xf8_16bpp/cfb8_16.h +++ b/hw/xfree86/xf8_16bpp/cfb8_16.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfb8_16.h,v 1.1 1999/01/31 12:22:16 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _CFB8_16_H #define _CFB8_16_H diff --git a/hw/xfree86/xf8_16bpp/cfb8_16module.c b/hw/xfree86/xf8_16bpp/cfb8_16module.c index 1a034980a..93f9b0126 100644 --- a/hw/xfree86/xf8_16bpp/cfb8_16module.c +++ b/hw/xfree86/xf8_16bpp/cfb8_16module.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/xf8_16bpp/cfbscrinit.c b/hw/xfree86/xf8_16bpp/cfbscrinit.c index 06af87b57..a6bc2a67e 100644 --- a/hw/xfree86/xf8_16bpp/cfbscrinit.c +++ b/hw/xfree86/xf8_16bpp/cfbscrinit.c @@ -6,6 +6,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbscrinit.c,v 1.7 2000/01/21 01:12:24 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/misc.h> diff --git a/hw/xfree86/xf8_16bpp/cfbwindow.c b/hw/xfree86/xf8_16bpp/cfbwindow.c index f2253de28..796311170 100644 --- a/hw/xfree86/xf8_16bpp/cfbwindow.c +++ b/hw/xfree86/xf8_16bpp/cfbwindow.c @@ -6,6 +6,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_16bpp/cfbwindow.c,v 1.4tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfb8_32.h b/hw/xfree86/xf8_32bpp/cfb8_32.h index d992b77c5..2785fa252 100644 --- a/hw/xfree86/xf8_32bpp/cfb8_32.h +++ b/hw/xfree86/xf8_32bpp/cfb8_32.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32.h,v 1.5 2000/03/02 02:32:52 mvojkovi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _CFB8_32_H #define _CFB8_32_H diff --git a/hw/xfree86/xf8_32bpp/cfb8_32module.c b/hw/xfree86/xf8_32bpp/cfb8_32module.c index 7b27e498a..6739b60fc 100644 --- a/hw/xfree86/xf8_32bpp/cfb8_32module.c +++ b/hw/xfree86/xf8_32bpp/cfb8_32module.c @@ -1,6 +1,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32module.c,v 1.5 1999/01/24 13:32:42 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/xf8_32bpp/cfbbstore.c b/hw/xfree86/xf8_32bpp/cfbbstore.c index 437f031cc..842b872d7 100644 --- a/hw/xfree86/xf8_32bpp/cfbbstore.c +++ b/hw/xfree86/xf8_32bpp/cfbbstore.c @@ -1,6 +1,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbbstore.c,v 1.2 1999/01/31 12:22:17 dawes Exp $ */ #define PSZ 8 +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include "cfb.h" #undef PSZ #include "cfb32.h" diff --git a/hw/xfree86/xf8_32bpp/cfbcpyarea.c b/hw/xfree86/xf8_32bpp/cfbcpyarea.c index 7d4812841..1a17220ab 100644 --- a/hw/xfree86/xf8_32bpp/cfbcpyarea.c +++ b/hw/xfree86/xf8_32bpp/cfbcpyarea.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyarea.c,v 1.5 2000/02/29 00:17:16 mvojkovi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/hw/xfree86/xf8_32bpp/cfbcpyplane.c b/hw/xfree86/xf8_32bpp/cfbcpyplane.c index 14b6f7350..011b9e763 100644 --- a/hw/xfree86/xf8_32bpp/cfbcpyplane.c +++ b/hw/xfree86/xf8_32bpp/cfbcpyplane.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/hw/xfree86/xf8_32bpp/cfbgc.c b/hw/xfree86/xf8_32bpp/cfbgc.c index ba4e3db06..d340e8c53 100644 --- a/hw/xfree86/xf8_32bpp/cfbgc.c +++ b/hw/xfree86/xf8_32bpp/cfbgc.c @@ -61,11 +61,15 @@ LOWMEMFTPT False False False False /* This gets built twice. Once for 8bpp and another for 32bpp */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "cfb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfbgcmisc.c b/hw/xfree86/xf8_32bpp/cfbgcmisc.c index 9a3bfc5ef..356b6cc9f 100644 --- a/hw/xfree86/xf8_32bpp/cfbgcmisc.c +++ b/hw/xfree86/xf8_32bpp/cfbgcmisc.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> @@ -8,7 +12,7 @@ #undef PSZ #include "cfb32.h" #include "cfb8_32.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfbgcunder.c b/hw/xfree86/xf8_32bpp/cfbgcunder.c index cd30fcea3..79176c86a 100644 --- a/hw/xfree86/xf8_32bpp/cfbgcunder.c +++ b/hw/xfree86/xf8_32bpp/cfbgcunder.c @@ -47,11 +47,15 @@ SOFTWARE. ******************************************************************/ #define PSZ 32 +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "cfb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfbimage.c b/hw/xfree86/xf8_32bpp/cfbimage.c index 25736fa74..8b0ea4a78 100644 --- a/hw/xfree86/xf8_32bpp/cfbimage.c +++ b/hw/xfree86/xf8_32bpp/cfbimage.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbimage.c,v 1.2 2000/02/25 00:21:40 mvojkovi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" #include "pixmapstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfbpntwin.c b/hw/xfree86/xf8_32bpp/cfbpntwin.c index 1088a10f9..30ddb0c4b 100644 --- a/hw/xfree86/xf8_32bpp/cfbpntwin.c +++ b/hw/xfree86/xf8_32bpp/cfbpntwin.c @@ -1,6 +1,10 @@ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.3 2005/04/20 12:25:40 daniels Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.1 1999/01/03 03:58:56 dawes Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" diff --git a/hw/xfree86/xf8_32bpp/cfbscrinit.c b/hw/xfree86/xf8_32bpp/cfbscrinit.c index 19b13939b..9deda1f5f 100644 --- a/hw/xfree86/xf8_32bpp/cfbscrinit.c +++ b/hw/xfree86/xf8_32bpp/cfbscrinit.c @@ -1,6 +1,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c,v 1.11 2001/04/14 21:17:49 mvojkovi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/misc.h> diff --git a/hw/xfree86/xf8_32bpp/cfbwindow.c b/hw/xfree86/xf8_32bpp/cfbwindow.c index 2ea23c59b..78d721495 100644 --- a/hw/xfree86/xf8_32bpp/cfbwindow.c +++ b/hw/xfree86/xf8_32bpp/cfbwindow.c @@ -1,6 +1,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbwindow.c,v 1.8tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" diff --git a/hw/xfree86/xf8_32bpp/xf86overlay.c b/hw/xfree86/xf8_32bpp/xf86overlay.c index a45804e2e..9b04eba43 100644 --- a/hw/xfree86/xf8_32bpp/xf86overlay.c +++ b/hw/xfree86/xf8_32bpp/xf86overlay.c @@ -6,6 +6,10 @@ Written by Mark Vojkovich (mvojkovi@ucsd.edu) */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/misc.h> #include "xf86.h" #include "xf86_ansic.h" diff --git a/hw/xfree86/xf8_32wid/cfb8_32wid.h b/hw/xfree86/xf8_32wid/cfb8_32wid.h index 1d1093e54..e1b81f967 100644 --- a/hw/xfree86/xf8_32wid/cfb8_32wid.h +++ b/hw/xfree86/xf8_32wid/cfb8_32wid.h @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _CFB8_32WID_H #define _CFB8_32WID_H diff --git a/hw/xfree86/xf8_32wid/cfb8_32widmodule.c b/hw/xfree86/xf8_32wid/cfb8_32widmodule.c index 95f8c9d02..ff7d3de15 100644 --- a/hw/xfree86/xf8_32wid/cfb8_32widmodule.c +++ b/hw/xfree86/xf8_32wid/cfb8_32widmodule.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" diff --git a/hw/xfree86/xf8_32wid/cfbscrinit.c b/hw/xfree86/xf8_32wid/cfbscrinit.c index ca4322e1a..438ea0882 100644 --- a/hw/xfree86/xf8_32wid/cfbscrinit.c +++ b/hw/xfree86/xf8_32wid/cfbscrinit.c @@ -9,6 +9,10 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/misc.h> diff --git a/hw/xfree86/xf8_32wid/cfbwid.c b/hw/xfree86/xf8_32wid/cfbwid.c index 832581093..4fcd4725e 100644 --- a/hw/xfree86/xf8_32wid/cfbwid.c +++ b/hw/xfree86/xf8_32wid/cfbwid.c @@ -1,5 +1,9 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/misc.h> diff --git a/hw/xfree86/xf8_32wid/cfbwindow.c b/hw/xfree86/xf8_32wid/cfbwindow.c index 1000c65f1..2e0d026f1 100644 --- a/hw/xfree86/xf8_32wid/cfbwindow.c +++ b/hw/xfree86/xf8_32wid/cfbwindow.c @@ -9,6 +9,10 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32wid/cfbwindow.c,v 1.2tsi Exp $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c index f78234ea0..d5ce79f85 100644 --- a/hw/xnest/Font.c +++ b/hw/xnest/Font.c @@ -19,8 +19,8 @@ is" without express or implied warranty. #include <X11/Xproto.h> #include <X11/misc.h> #include "regionstr.h" -#include "font.h" -#include "fontstruct.h" +#include <X11/fonts/font.h> +#include <X11/fonts/fontstruct.h> #include "scrnintstr.h" #include "Xnest.h" diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c index f9f8ab9a1..8ef90588f 100644 --- a/hw/xnest/GC.c +++ b/hw/xnest/GC.c @@ -20,7 +20,7 @@ is" without express or implied warranty. #include "windowstr.h" #include "pixmapstr.h" #include "scrnintstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mistruct.h" #include "region.h" diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c index b3cccc2d5..0e80f7118 100644 --- a/hw/xnest/GCOps.c +++ b/hw/xnest/GCOps.c @@ -17,7 +17,7 @@ is" without express or implied warranty. #include <X11/X.h> #include <X11/Xproto.h> #include "regionstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "gcstruct.h" #include "scrnintstr.h" #include "windowstr.h" diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c index eaf1f5609..3e9a4bd9b 100644 --- a/hw/xnest/Init.c +++ b/hw/xnest/Init.c @@ -23,7 +23,7 @@ is" without express or implied warranty. #include "windowstr.h" #include "servermd.h" #include "mi.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "Xnest.h" diff --git a/ilbm/ilbm.h b/ilbm/ilbm.h index 7e015ebc4..eba35c200 100644 --- a/ilbm/ilbm.h +++ b/ilbm/ilbm.h @@ -55,6 +55,10 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "pixmap.h" #include "region.h" #include "gc.h" diff --git a/ilbm/ilbmbitblt.c b/ilbm/ilbmbitblt.c index ad944025e..11a0e07fb 100644 --- a/ilbm/ilbmbitblt.c +++ b/ilbm/ilbmbitblt.c @@ -52,6 +52,10 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> diff --git a/ilbm/ilbmblt.c b/ilbm/ilbmblt.c index 1f8434012..9b11567ca 100644 --- a/ilbm/ilbmblt.c +++ b/ilbm/ilbmblt.c @@ -36,6 +36,10 @@ Author: Keith Packard /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/ilbm/ilbmbres.c b/ilbm/ilbmbres.c index e70e8507f..1e27e0b93 100644 --- a/ilbm/ilbmbres.c +++ b/ilbm/ilbmbres.c @@ -52,6 +52,10 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "ilbm.h" diff --git a/ilbm/ilbmbresd.c b/ilbm/ilbmbresd.c index aa15fb93b..fad901e4a 100644 --- a/ilbm/ilbmbresd.c +++ b/ilbm/ilbmbresd.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "ilbm.h" diff --git a/ilbm/ilbmbstore.c b/ilbm/ilbmbstore.c index af72db549..56811792f 100644 --- a/ilbm/ilbmbstore.c +++ b/ilbm/ilbmbstore.c @@ -34,6 +34,10 @@ from the X Consortium. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "ilbm.h" #include <X11/X.h> #include "mibstore.h" diff --git a/ilbm/ilbmclip.c b/ilbm/ilbmclip.c index 6aa654b17..704b5a9cd 100644 --- a/ilbm/ilbmclip.c +++ b/ilbm/ilbmclip.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "miscstruct.h" #include "pixmapstr.h" diff --git a/ilbm/ilbmcmap.c b/ilbm/ilbmcmap.c index 37bfcfd48..e485fb6fe 100644 --- a/ilbm/ilbmcmap.c +++ b/ilbm/ilbmcmap.c @@ -32,6 +32,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "scrnintstr.h" diff --git a/ilbm/ilbmfillarc.c b/ilbm/ilbmfillarc.c index f61a01643..a5ab6c4a2 100644 --- a/ilbm/ilbmfillarc.c +++ b/ilbm/ilbmfillarc.c @@ -31,6 +31,10 @@ in this Software without prior written authorization from the X Consortium. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "miscstruct.h" diff --git a/ilbm/ilbmfillrct.c b/ilbm/ilbmfillrct.c index 734319240..604046080 100644 --- a/ilbm/ilbmfillrct.c +++ b/ilbm/ilbmfillrct.c @@ -52,6 +52,10 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "pixmapstr.h" diff --git a/ilbm/ilbmfillsp.c b/ilbm/ilbmfillsp.c index 95eb220ac..321154330 100644 --- a/ilbm/ilbmfillsp.c +++ b/ilbm/ilbmfillsp.c @@ -52,6 +52,10 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "gcstruct.h" diff --git a/ilbm/ilbmfont.c b/ilbm/ilbmfont.c index c39f0785d..84ef8e5d1 100644 --- a/ilbm/ilbmfont.c +++ b/ilbm/ilbmfont.c @@ -51,11 +51,15 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "ilbm.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "scrnintstr.h" diff --git a/ilbm/ilbmgc.c b/ilbm/ilbmgc.c index 646ed1646..f87f1fc9c 100644 --- a/ilbm/ilbmgc.c +++ b/ilbm/ilbmgc.c @@ -51,12 +51,16 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "ilbm.h" #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "gcstruct.h" #include "windowstr.h" #include "pixmapstr.h" diff --git a/ilbm/ilbmgetsp.c b/ilbm/ilbmgetsp.c index 16578fcd8..764e138a3 100644 --- a/ilbm/ilbmgetsp.c +++ b/ilbm/ilbmgetsp.c @@ -52,6 +52,10 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> diff --git a/ilbm/ilbmhrzvert.c b/ilbm/ilbmhrzvert.c index 7105e458b..9612749cf 100644 --- a/ilbm/ilbmhrzvert.c +++ b/ilbm/ilbmhrzvert.c @@ -52,6 +52,10 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gc.h" diff --git a/ilbm/ilbmimage.c b/ilbm/ilbmimage.c index ecaad9029..ddb19ac6a 100644 --- a/ilbm/ilbmimage.c +++ b/ilbm/ilbmimage.c @@ -1,4 +1,8 @@ /* $XFree86: xc/programs/Xserver/ilbm/ilbmimage.c,v 3.0 1996/08/18 01:53:56 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) diff --git a/ilbm/ilbmimggblt.c b/ilbm/ilbmimggblt.c index b5802ae7d..7fc1f3144 100644 --- a/ilbm/ilbmimggblt.c +++ b/ilbm/ilbmimggblt.c @@ -52,11 +52,15 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "ilbm.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/ilbm/ilbmline.c b/ilbm/ilbmline.c index 5bf832a76..aa13fc114 100644 --- a/ilbm/ilbmline.c +++ b/ilbm/ilbmline.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" diff --git a/ilbm/ilbmmisc.c b/ilbm/ilbmmisc.c index 195491a52..86a641649 100644 --- a/ilbm/ilbmmisc.c +++ b/ilbm/ilbmmisc.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "cursor.h" diff --git a/ilbm/ilbmpixmap.c b/ilbm/ilbmpixmap.c index 825b18267..bd977e627 100644 --- a/ilbm/ilbmpixmap.c +++ b/ilbm/ilbmpixmap.c @@ -57,6 +57,10 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/Xmd.h> #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/ilbm/ilbmply1rct.c b/ilbm/ilbmply1rct.c index 6fdef5d4b..490551db7 100644 --- a/ilbm/ilbmply1rct.c +++ b/ilbm/ilbmply1rct.c @@ -31,6 +31,10 @@ in this Software without prior written authorization from the X Consortium. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" diff --git a/ilbm/ilbmplygblt.c b/ilbm/ilbmplygblt.c index 173f7b985..9b60e1100 100644 --- a/ilbm/ilbmplygblt.c +++ b/ilbm/ilbmplygblt.c @@ -52,11 +52,15 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "ilbm.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/ilbm/ilbmpntarea.c b/ilbm/ilbmpntarea.c index 77de2c480..f61f7fcf9 100644 --- a/ilbm/ilbmpntarea.c +++ b/ilbm/ilbmpntarea.c @@ -52,6 +52,10 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" diff --git a/ilbm/ilbmpntwin.c b/ilbm/ilbmpntwin.c index 4d4c45816..b12a121c8 100644 --- a/ilbm/ilbmpntwin.c +++ b/ilbm/ilbmpntwin.c @@ -52,6 +52,10 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" diff --git a/ilbm/ilbmpolypnt.c b/ilbm/ilbmpolypnt.c index 0dc6df674..87666d7b6 100644 --- a/ilbm/ilbmpolypnt.c +++ b/ilbm/ilbmpolypnt.c @@ -52,6 +52,10 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "pixmapstr.h" diff --git a/ilbm/ilbmpushpxl.c b/ilbm/ilbmpushpxl.c index 9f1b26ea2..337172703 100644 --- a/ilbm/ilbmpushpxl.c +++ b/ilbm/ilbmpushpxl.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" #include "scrnintstr.h" diff --git a/ilbm/ilbmscrinit.c b/ilbm/ilbmscrinit.c index 8fb1baa32..37425d0d6 100644 --- a/ilbm/ilbmscrinit.c +++ b/ilbm/ilbmscrinit.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> /* for xColorItem */ #include <X11/Xmd.h> diff --git a/ilbm/ilbmsetsp.c b/ilbm/ilbmsetsp.c index 7b4f55a16..fb73a78e6 100644 --- a/ilbm/ilbmsetsp.c +++ b/ilbm/ilbmsetsp.c @@ -52,6 +52,10 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> diff --git a/ilbm/ilbmtegblt.c b/ilbm/ilbmtegblt.c index 0f6a8e535..c1c1eac49 100644 --- a/ilbm/ilbmtegblt.c +++ b/ilbm/ilbmtegblt.c @@ -52,11 +52,15 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "ilbm.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/ilbm/ilbmtile.c b/ilbm/ilbmtile.c index 4d9db06e9..b35d00028 100644 --- a/ilbm/ilbmtile.c +++ b/ilbm/ilbmtile.c @@ -52,6 +52,10 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" diff --git a/ilbm/ilbmwindow.c b/ilbm/ilbmwindow.c index 74944ea54..be84fcefb 100644 --- a/ilbm/ilbmwindow.c +++ b/ilbm/ilbmwindow.c @@ -52,6 +52,10 @@ SOFTWARE. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" diff --git a/ilbm/ilbmzerarc.c b/ilbm/ilbmzerarc.c index f5a58ea5d..ad20d614b 100644 --- a/ilbm/ilbmzerarc.c +++ b/ilbm/ilbmzerarc.c @@ -37,6 +37,10 @@ in this Software without prior written authorization from the X Consortium. /* Modified jun 95 by Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be) to use interleaved bitplanes instead of normal bitplanes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "miscstruct.h" diff --git a/include/XIstubs.h b/include/XIstubs.h index e005493c4..940604887 100644 --- a/include/XIstubs.h +++ b/include/XIstubs.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 XI_STUBS_H #define XI_STUBS_H 1 diff --git a/include/bstore.h b/include/bstore.h index 098abcd86..22dd02828 100644 --- a/include/bstore.h +++ b/include/bstore.h @@ -15,6 +15,10 @@ * -- 1997.10.27 Marc Aurele La France (tsi@xfree86.org) */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _BSTORE_H_ #define _BSTORE_H_ diff --git a/include/bstorestr.h b/include/bstorestr.h index 8f21855c4..8452396d0 100644 --- a/include/bstorestr.h +++ b/include/bstorestr.h @@ -15,6 +15,10 @@ * -- 1997.10.27 Marc Aurele La France (tsi@xfree86.org) */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _BSTORESTR_H_ #define _BSTORESTR_H_ diff --git a/include/closestr.h b/include/closestr.h index 0102a737f..3ef8de48f 100644 --- a/include/closestr.h +++ b/include/closestr.h @@ -29,6 +29,10 @@ from The Open Group. /* $XFree86: xc/programs/Xserver/include/closestr.h,v 3.4 2001/12/14 19:59:53 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef CLOSESTR_H #define CLOSESTR_H diff --git a/include/closure.h b/include/closure.h index d80388bf4..b8f21f9d7 100644 --- a/include/closure.h +++ b/include/closure.h @@ -45,6 +45,10 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef CLOSURE_H #define CLOSURE_H 1 diff --git a/include/colormap.h b/include/colormap.h index 1f2c33075..baf3dcdb5 100644 --- a/include/colormap.h +++ b/include/colormap.h @@ -47,6 +47,10 @@ SOFTWARE. */ /* $Xorg: colormap.h,v 1.4 2001/02/09 02:05:14 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef CMAP_H #define CMAP_H 1 diff --git a/include/colormapst.h b/include/colormapst.h index b176f7dc3..519ead1f0 100644 --- a/include/colormapst.h +++ b/include/colormapst.h @@ -45,6 +45,10 @@ SOFTWARE. */ /* $Xorg: colormapst.h,v 1.4 2001/02/09 02:05:14 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef CMAPSTRUCT_H #define CMAPSTRUCT_H 1 diff --git a/include/cursor.h b/include/cursor.h index 5f9467a2b..dc776bb1a 100644 --- a/include/cursor.h +++ b/include/cursor.h @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: cursor.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef CURSOR_H #define CURSOR_H diff --git a/include/cursorstr.h b/include/cursorstr.h index c877d6cc9..b4ce35c6e 100644 --- a/include/cursorstr.h +++ b/include/cursorstr.h @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/cursorstr.h,v 1.8 2002/11/30 06:21:51 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef CURSORSTRUCT_H #define CURSORSTRUCT_H diff --git a/include/dix.h b/include/dix.h index 1b8fc4265..1ad1cbc8a 100644 --- a/include/dix.h +++ b/include/dix.h @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: dix.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef DIX_H #define DIX_H diff --git a/include/dixevents.h b/include/dixevents.h index 46a5faef0..96ae17149 100644 --- a/include/dixevents.h +++ b/include/dixevents.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 DIXEVENTS_H #define DIXEVENTS_H diff --git a/include/dixfont.h b/include/dixfont.h index d3bb69b0a..1d249b302 100644 --- a/include/dixfont.h +++ b/include/dixfont.h @@ -23,13 +23,17 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.7 2001/02/02 21:39:02 herrb Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef DIXFONT_H #define DIXFONT_H 1 #include "dix.h" -#include "font.h" +#include <X11/fonts/font.h> #include "closure.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #define NullDIXFontProp ((DIXFontPropPtr)0) diff --git a/include/dixfontstr.h b/include/dixfontstr.h index 757b8bbc4..ba696c56f 100644 --- a/include/dixfontstr.h +++ b/include/dixfontstr.h @@ -22,12 +22,16 @@ SOFTWARE. ******************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef DIXFONTSTRUCT_H #define DIXFONTSTRUCT_H #include "servermd.h" #include "dixfont.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "closure.h" #define NEED_REPLIES #include <X11/Xproto.h> /* for xQueryFontReply */ diff --git a/include/dixgrabs.h b/include/dixgrabs.h index 042e063db..cb07c6d11 100644 --- a/include/dixgrabs.h +++ b/include/dixgrabs.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 DIXGRABS_H #define DIXGRABS_H 1 diff --git a/include/dixstruct.h b/include/dixstruct.h index d7d810272..5c1281ab2 100644 --- a/include/dixstruct.h +++ b/include/dixstruct.h @@ -23,6 +23,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: dixstruct.h,v 1.3 2000/08/17 19:53:29 cpqbld Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef DIXSTRUCT_H #define DIXSTRUCT_H diff --git a/include/exevents.h b/include/exevents.h index 91c7acb6b..fdd253c85 100644 --- a/include/exevents.h +++ b/include/exevents.h @@ -28,6 +28,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * Interface of 'exevents.c' */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef EXEVENTS_H #define EXEVENTS_H diff --git a/include/extension.h b/include/extension.h index 34750173b..7d4e4accb 100644 --- a/include/extension.h +++ b/include/extension.h @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/extension.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef EXTENSION_H #define EXTENSION_H diff --git a/include/extinit.h b/include/extinit.h index 37fa9a245..3dcf179e1 100644 --- a/include/extinit.h +++ b/include/extinit.h @@ -28,6 +28,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * Interface of extinit.c */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef EXTINIT_H #define EXTINIT_H diff --git a/include/extnsionst.h b/include/extnsionst.h index 5ed009958..f830d03e2 100644 --- a/include/extnsionst.h +++ b/include/extnsionst.h @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/extnsionst.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef EXTENSIONSTRUCT_H #define EXTENSIONSTRUCT_H diff --git a/include/gc.h b/include/gc.h index 77c2f20c6..b4a3b3af2 100644 --- a/include/gc.h +++ b/include/gc.h @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: gc.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef GC_H #define GC_H diff --git a/include/gcstruct.h b/include/gcstruct.h index c2226ba17..a8f2ad0be 100644 --- a/include/gcstruct.h +++ b/include/gcstruct.h @@ -49,6 +49,10 @@ SOFTWARE. /* $XFree86: xc/programs/Xserver/include/gcstruct.h,v 1.7 2003/04/27 21:31:04 herrb Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef GCSTRUCT_H #define GCSTRUCT_H diff --git a/include/globals.h b/include/globals.h index 924608e89..775409183 100644 --- a/include/globals.h +++ b/include/globals.h @@ -1,6 +1,10 @@ /* $XdotOrg: xc/programs/Xserver/include/globals.h,v 1.6 2005/05/19 18:53:49 ajax Exp $ */ /* $XFree86: xc/programs/Xserver/include/globals.h,v 1.3 1999/09/25 14:38:21 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _XSERV_GLOBAL_H_ #define _XSERV_GLOBAL_H_ diff --git a/include/input.h b/include/input.h index 97adf6fb3..8cda1964b 100644 --- a/include/input.h +++ b/include/input.h @@ -47,6 +47,10 @@ SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/include/input.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef INPUT_H #define INPUT_H diff --git a/include/inputstr.h b/include/inputstr.h index b54e8a1d5..9d0bf4057 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -48,6 +48,10 @@ SOFTWARE. /* $Xorg: inputstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef INPUTSTRUCT_H #define INPUTSTRUCT_H diff --git a/include/miscstruct.h b/include/miscstruct.h index 0ba871bc0..ec90dfb29 100644 --- a/include/miscstruct.h +++ b/include/miscstruct.h @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/miscstruct.h,v 3.4 2003/04/27 21:31:04 herrb Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef MISCSTRUCT_H #define MISCSTRUCT_H 1 diff --git a/include/opaque.h b/include/opaque.h index 09a3570f9..8d7408f8a 100644 --- a/include/opaque.h +++ b/include/opaque.h @@ -28,6 +28,10 @@ from The Open Group. */ /* $XFree86: xc/programs/Xserver/include/opaque.h,v 1.13 2003/07/24 13:50:25 eich Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef OPAQUE_H #define OPAQUE_H diff --git a/include/pixmap.h b/include/pixmap.h index 1777b2407..dc0655ffc 100644 --- a/include/pixmap.h +++ b/include/pixmap.h @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef PIXMAP_H #define PIXMAP_H diff --git a/include/pixmapstr.h b/include/pixmapstr.h index 22a1f1025..465e7bcb7 100644 --- a/include/pixmapstr.h +++ b/include/pixmapstr.h @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef PIXMAPSTRUCT_H #define PIXMAPSTRUCT_H #include "pixmap.h" diff --git a/include/property.h b/include/property.h index 21a38d51c..6b8988112 100644 --- a/include/property.h +++ b/include/property.h @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/property.h,v 1.3 2001/12/14 19:59:55 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef PROPERTY_H #define PROPERTY_H diff --git a/include/propertyst.h b/include/propertyst.h index 24eed070e..57759933d 100644 --- a/include/propertyst.h +++ b/include/propertyst.h @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/propertyst.h,v 3.2 2001/01/17 22:36:57 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef PROPERTYSTRUCT_H #define PROPERTYSTRUCT_H #include <X11/misc.h> diff --git a/include/region.h b/include/region.h index 64f0ff444..0c67fe9ee 100644 --- a/include/region.h +++ b/include/region.h @@ -45,6 +45,10 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef REGION_H #define REGION_H diff --git a/include/regionstr.h b/include/regionstr.h index 0af87bde8..dfee705a9 100644 --- a/include/regionstr.h +++ b/include/regionstr.h @@ -48,6 +48,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.12tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef REGIONSTRUCT_H #define REGIONSTRUCT_H diff --git a/include/resource.h b/include/resource.h index ebd32e359..e896bf076 100644 --- a/include/resource.h +++ b/include/resource.h @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/resource.h,v 1.11 2002/03/06 21:14:04 mvojkovi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef RESOURCE_H #define RESOURCE_H 1 #include <X11/misc.h> diff --git a/include/rgb.h b/include/rgb.h index 5741a4efa..45f44d738 100644 --- a/include/rgb.h +++ b/include/rgb.h @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: rgb.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef RGB_H #define RGB_H typedef struct _RGB { diff --git a/include/screenint.h b/include/screenint.h index aaa8086fb..edd875e94 100644 --- a/include/screenint.h +++ b/include/screenint.h @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/screenint.h,v 1.5 2001/12/14 19:59:56 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef SCREENINT_H #define SCREENINT_H diff --git a/include/scrnintstr.h b/include/scrnintstr.h index ef9358689..a0e103a4e 100644 --- a/include/scrnintstr.h +++ b/include/scrnintstr.h @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/scrnintstr.h,v 1.12 2003/04/27 21:31:05 herrb Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef SCREENINTSTRUCT_H #define SCREENINTSTRUCT_H diff --git a/include/selection.h b/include/selection.h index 520cfd4aa..fa6abca65 100644 --- a/include/selection.h +++ b/include/selection.h @@ -1,4 +1,8 @@ /* $Xorg: selection.h,v 1.4 2001/02/09 02:05:16 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef SELECTION_H #define SELECTION_H 1 diff --git a/include/servermd.h b/include/servermd.h index 66fe14034..e21eecf8c 100644 --- a/include/servermd.h +++ b/include/servermd.h @@ -48,6 +48,10 @@ SOFTWARE. /* $Xorg: servermd.h,v 1.3 2000/08/17 19:53:31 cpqbld Exp $ */ /* $XdotOrg: xc/programs/Xserver/include/servermd.h,v 1.4 2005/05/21 07:46:38 alanc Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef SERVERMD_H #define SERVERMD_H 1 diff --git a/include/site.h b/include/site.h index be8c003da..5b0c69381 100644 --- a/include/site.h +++ b/include/site.h @@ -47,6 +47,10 @@ SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/include/site.h,v 1.8 2001/12/19 21:37:35 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef SITE_H #define SITE_H /* diff --git a/include/swaprep.h b/include/swaprep.h index 2c026c659..cd04164be 100644 --- a/include/swaprep.h +++ b/include/swaprep.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 SWAPREP_H #define SWAPREP_H 1 diff --git a/include/swapreq.h b/include/swapreq.h index 9c59bbf84..b8455086d 100644 --- a/include/swapreq.h +++ b/include/swapreq.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 SWAPREQ_H #define SWAPREQ_H 1 diff --git a/include/validate.h b/include/validate.h index 467533d22..7d30b94a9 100644 --- a/include/validate.h +++ b/include/validate.h @@ -26,6 +26,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/include/validate.h,v 1.4 2001/01/17 22:36:58 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef VALIDATE_H #define VALIDATE_H diff --git a/include/window.h b/include/window.h index 2ffcab370..1265727d5 100644 --- a/include/window.h +++ b/include/window.h @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef WINDOW_H #define WINDOW_H diff --git a/include/windowstr.h b/include/windowstr.h index 89e3ee10b..8e4b4e096 100644 --- a/include/windowstr.h +++ b/include/windowstr.h @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/windowstr.h,v 1.6 2001/12/14 19:59:57 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef WINDOWSTRUCT_H #define WINDOWSTRUCT_H diff --git a/iplan2p4/ipl.h b/iplan2p4/ipl.h index d6cf45b14..356e43367 100644 --- a/iplan2p4/ipl.h +++ b/iplan2p4/ipl.h @@ -32,6 +32,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "pixmap.h" #include "region.h" diff --git a/iplan2p4/iplallpriv.c b/iplan2p4/iplallpriv.c index eadca0a01..23a13dbd1 100644 --- a/iplan2p4/iplallpriv.c +++ b/iplan2p4/iplallpriv.c @@ -31,6 +31,10 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/iplan2p4/iplbitblt.c b/iplan2p4/iplbitblt.c index 7c157aad6..4bf64437e 100644 --- a/iplan2p4/iplbitblt.c +++ b/iplan2p4/iplbitblt.c @@ -36,6 +36,10 @@ Author: Keith Packard /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/iplan2p4/iplblt.c b/iplan2p4/iplblt.c index 850ee5c43..85bcece13 100644 --- a/iplan2p4/iplblt.c +++ b/iplan2p4/iplblt.c @@ -36,6 +36,10 @@ Author: Keith Packard /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/iplan2p4/iplbres.c b/iplan2p4/iplbres.c index c3830649e..a9d6966e9 100644 --- a/iplan2p4/iplbres.c +++ b/iplan2p4/iplbres.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "ipl.h" diff --git a/iplan2p4/iplbresd.c b/iplan2p4/iplbresd.c index 7ac7b1cdb..d78ed4b61 100644 --- a/iplan2p4/iplbresd.c +++ b/iplan2p4/iplbresd.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "ipl.h" diff --git a/iplan2p4/iplbstore.c b/iplan2p4/iplbstore.c index 64874a407..d2fc23513 100644 --- a/iplan2p4/iplbstore.c +++ b/iplan2p4/iplbstore.c @@ -16,6 +16,10 @@ * * */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef lint static char rcsid[] = "$XConsortium: iplbstore.c,v 5.8 93/12/13 17:21:51 dpw Exp $ SPRITE (Berkeley)"; diff --git a/iplan2p4/iplcmap.c b/iplan2p4/iplcmap.c index a6e8f2184..0f3cdca14 100644 --- a/iplan2p4/iplcmap.c +++ b/iplan2p4/iplcmap.c @@ -32,6 +32,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "scrnintstr.h" diff --git a/iplan2p4/iplfillarc.c b/iplan2p4/iplfillarc.c index 62571114a..f62ff9f9e 100644 --- a/iplan2p4/iplfillarc.c +++ b/iplan2p4/iplfillarc.c @@ -31,6 +31,10 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "miscstruct.h" diff --git a/iplan2p4/iplfillrct.c b/iplan2p4/iplfillrct.c index 40b9d435c..a3301457b 100644 --- a/iplan2p4/iplfillrct.c +++ b/iplan2p4/iplfillrct.c @@ -34,6 +34,10 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/iplan2p4/iplfillsp.c b/iplan2p4/iplfillsp.c index 5bf0b0b50..863d369af 100644 --- a/iplan2p4/iplfillsp.c +++ b/iplan2p4/iplfillsp.c @@ -81,6 +81,10 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/iplan2p4/iplgc.c b/iplan2p4/iplgc.c index 925f34909..1cbcb7522 100644 --- a/iplan2p4/iplgc.c +++ b/iplan2p4/iplgc.c @@ -52,11 +52,15 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "ipl.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/iplan2p4/iplgetsp.c b/iplan2p4/iplgetsp.c index 3478a8051..619c438db 100644 --- a/iplan2p4/iplgetsp.c +++ b/iplan2p4/iplgetsp.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/iplan2p4/iplhrzvert.c b/iplan2p4/iplhrzvert.c index 621b55ba5..45faaa1cb 100644 --- a/iplan2p4/iplhrzvert.c +++ b/iplan2p4/iplhrzvert.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gc.h" diff --git a/iplan2p4/iplimage.c b/iplan2p4/iplimage.c index 644fd3c07..5b72b885f 100644 --- a/iplan2p4/iplimage.c +++ b/iplan2p4/iplimage.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" #include "pixmapstr.h" diff --git a/iplan2p4/iplline.c b/iplan2p4/iplline.c index 19f230e07..19d078cb2 100644 --- a/iplan2p4/iplline.c +++ b/iplan2p4/iplline.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" diff --git a/iplan2p4/iplmap.h b/iplan2p4/iplmap.h index b188ec3ec..cc065aa82 100644 --- a/iplan2p4/iplmap.h +++ b/iplan2p4/iplmap.h @@ -37,6 +37,10 @@ interleaved planes */ /* a losing vendor cpp dumps core if we define NAME in terms of CATNAME */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #if INTER_PLANES == 2 #define NAME(subname) ipl2p2##subname #elif INTER_PLANES == 4 diff --git a/iplan2p4/iplmergerop.h b/iplan2p4/iplmergerop.h index bd3736759..09141c983 100644 --- a/iplan2p4/iplmergerop.h +++ b/iplan2p4/iplmergerop.h @@ -1,4 +1,8 @@ /* $XFree86: xc/programs/Xserver/iplan2p4/iplmergerop.h,v 3.0 1996/08/18 01:54:53 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _IPLANMERGEROP_H_ #define _IPLANMERGEROP_H_ diff --git a/iplan2p4/iplmskbits.c b/iplan2p4/iplmskbits.c index d408b804e..e611bd293 100644 --- a/iplan2p4/iplmskbits.c +++ b/iplan2p4/iplmskbits.c @@ -1,6 +1,10 @@ /* $XFree86$ */ /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "iplmap.h" unsigned short iplmask[] = diff --git a/iplan2p4/iplmskbits.h b/iplan2p4/iplmskbits.h index 51bb26393..1efc47d44 100644 --- a/iplan2p4/iplmskbits.h +++ b/iplan2p4/iplmskbits.h @@ -42,6 +42,10 @@ extern INTER_PIXGRP iplendpartial[]; _IG(xor) = 0; \ }) +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #if INTER_PLANES == 2 #define PLANE_TIMESCONDG(x) \ diff --git a/iplan2p4/iplpixmap.c b/iplan2p4/iplpixmap.c index 9a1e35852..324b161e2 100644 --- a/iplan2p4/iplpixmap.c +++ b/iplan2p4/iplpixmap.c @@ -56,6 +56,10 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/Xmd.h> #include "servermd.h" #include "scrnintstr.h" diff --git a/iplan2p4/iplply1rct.c b/iplan2p4/iplply1rct.c index 6d172a16b..bac2be4ed 100644 --- a/iplan2p4/iplply1rct.c +++ b/iplan2p4/iplply1rct.c @@ -31,6 +31,10 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" diff --git a/iplan2p4/iplpntwin.c b/iplan2p4/iplpntwin.c index d58d4bb1f..8421ba377 100644 --- a/iplan2p4/iplpntwin.c +++ b/iplan2p4/iplpntwin.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" diff --git a/iplan2p4/iplpolypnt.c b/iplan2p4/iplpolypnt.c index 3bcd48360..61aea7ffd 100644 --- a/iplan2p4/iplpolypnt.c +++ b/iplan2p4/iplpolypnt.c @@ -31,6 +31,10 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" #include "windowstr.h" diff --git a/iplan2p4/iplrrop.c b/iplan2p4/iplrrop.c index dc3bad6a7..1b65fa9dc 100644 --- a/iplan2p4/iplrrop.c +++ b/iplan2p4/iplrrop.c @@ -33,6 +33,10 @@ interleaved planes */ /* ipl reduced rasterop computations */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/iplan2p4/iplrrop.h b/iplan2p4/iplrrop.h index 31e7b79b1..05a88fea4 100644 --- a/iplan2p4/iplrrop.h +++ b/iplan2p4/iplrrop.h @@ -9,6 +9,10 @@ interleaved planes */ #define INTER_RROP_FETCH_GC(gc) \ INTER_RROP_FETCH_GCPRIV(((iplPrivGCPtr)(gc)->devPrivates[iplGCPrivateIndex].ptr)) +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #if RROP == GXcopy #define INTER_RROP_DECLARE register unsigned short *rrop_xor; #define INTER_RROP_FETCH_GCPRIV(devPriv) rrop_xor = (devPriv)->xorg; diff --git a/iplan2p4/iplscrinit.c b/iplan2p4/iplscrinit.c index 825d4f9d2..073e7b9a4 100644 --- a/iplan2p4/iplscrinit.c +++ b/iplan2p4/iplscrinit.c @@ -32,6 +32,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/iplan2p4/iplsetsp.c b/iplan2p4/iplsetsp.c index 7ad378747..e64dbf4e4 100644 --- a/iplan2p4/iplsetsp.c +++ b/iplan2p4/iplsetsp.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/iplan2p4/iplsolid.c b/iplan2p4/iplsolid.c index 7875f7903..768bf0ace 100644 --- a/iplan2p4/iplsolid.c +++ b/iplan2p4/iplsolid.c @@ -31,6 +31,10 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/iplan2p4/ipltegblt.c b/iplan2p4/ipltegblt.c index 167bc25a1..9a46e31c6 100644 --- a/iplan2p4/ipltegblt.c +++ b/iplan2p4/ipltegblt.c @@ -51,11 +51,15 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "ipl.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/iplan2p4/ipltile32.c b/iplan2p4/ipltile32.c index 5a5e04080..06be5a2e8 100644 --- a/iplan2p4/ipltile32.c +++ b/iplan2p4/ipltile32.c @@ -35,6 +35,10 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/iplan2p4/ipltileodd.c b/iplan2p4/ipltileodd.c index 32ffadbe4..7230a5621 100644 --- a/iplan2p4/ipltileodd.c +++ b/iplan2p4/ipltileodd.c @@ -35,6 +35,10 @@ in this Software without prior written authorization from the X Consortium. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/iplan2p4/iplwindow.c b/iplan2p4/iplwindow.c index c8cd4c133..511e753b3 100644 --- a/iplan2p4/iplwindow.c +++ b/iplan2p4/iplwindow.c @@ -51,6 +51,10 @@ SOFTWARE. /* Modified nov 94 by Martin Schaller (Martin_Schaller@maus.r.de) for use with interleaved planes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" diff --git a/lbx/lbxcmap.c b/lbx/lbxcmap.c index 8214136e9..e65f8efd2 100644 --- a/lbx/lbxcmap.c +++ b/lbx/lbxcmap.c @@ -27,6 +27,10 @@ from The Open Group. */ /* $XFree86: xc/programs/Xserver/lbx/lbxcmap.c,v 1.9 2001/08/23 14:46:57 alanh Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <sys/types.h> #define NEED_REPLIES #define NEED_EVENTS diff --git a/lbx/lbxdata.h b/lbx/lbxdata.h index 8b5343bfd..b577f6e50 100644 --- a/lbx/lbxdata.h +++ b/lbx/lbxdata.h @@ -22,6 +22,10 @@ * */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _LBXDATA_H_ #define _LBXDATA_H_ #define NEED_REPLIES diff --git a/lbx/lbxdix.c b/lbx/lbxdix.c index d3eb0af46..9b12453b3 100644 --- a/lbx/lbxdix.c +++ b/lbx/lbxdix.c @@ -50,6 +50,10 @@ in this Software without prior written authorization from The Open Group. /* various bits of DIX-level mangling */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <sys/types.h> #include <stdio.h> #define NEED_REPLIES diff --git a/lbx/lbxexts.c b/lbx/lbxexts.c index 5750ba5b1..2dbd7e9af 100644 --- a/lbx/lbxexts.c +++ b/lbx/lbxexts.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/lbx/lbxexts.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/lbx/lbxgfx.c b/lbx/lbxgfx.c index f1c1623b0..877ce8e05 100644 --- a/lbx/lbxgfx.c +++ b/lbx/lbxgfx.c @@ -25,6 +25,10 @@ /* various bits of DIX-level mangling */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <sys/types.h> #include <stdio.h> #define NEED_REPLIES diff --git a/lbx/lbxmain.c b/lbx/lbxmain.c index 92958fedd..f99e7af05 100644 --- a/lbx/lbxmain.c +++ b/lbx/lbxmain.c @@ -47,6 +47,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/lbx/lbxmain.c,v 1.12 2001/10/28 03:34:12 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <sys/types.h> #define NEED_REPLIES #define NEED_EVENTS diff --git a/lbx/lbxopts.c b/lbx/lbxopts.c index 619af011a..53f5efed9 100644 --- a/lbx/lbxopts.c +++ b/lbx/lbxopts.c @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/lbx/lbxopts.c,v 1.5 2001/01/17 22:37:00 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef OPTDEBUG #include <stdio.h> #endif diff --git a/lbx/lbxprop.c b/lbx/lbxprop.c index c76235313..09d818f0c 100644 --- a/lbx/lbxprop.c +++ b/lbx/lbxprop.c @@ -50,6 +50,10 @@ in this Software without prior written authorization from The Open Group. /* various bits of DIX-level mangling */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <sys/types.h> #include <stdio.h> #define NEED_REPLIES diff --git a/lbx/lbxserve.h b/lbx/lbxserve.h index ed82f5aee..195e985b3 100644 --- a/lbx/lbxserve.h +++ b/lbx/lbxserve.h @@ -47,6 +47,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/lbx/lbxserve.h,v 1.4 2001/08/01 00:44:58 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _LBXSERVE_H_ #include "colormap.h" diff --git a/lbx/lbxsquish.c b/lbx/lbxsquish.c index 450364766..65c66e717 100644 --- a/lbx/lbxsquish.c +++ b/lbx/lbxsquish.c @@ -49,6 +49,10 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/Xserver/lbx/lbxsquish.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/Xos.h> diff --git a/lbx/lbxsrvopts.h b/lbx/lbxsrvopts.h index 8b0420452..9cf3d7630 100644 --- a/lbx/lbxsrvopts.h +++ b/lbx/lbxsrvopts.h @@ -23,6 +23,10 @@ */ /* $XFree86: xc/programs/Xserver/lbx/lbxsrvopts.h,v 1.2 2000/05/18 23:46:24 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _LBX_SRVOPTS_H_ #define _LBX_SRVOPTS_H_ diff --git a/lbx/lbxswap.c b/lbx/lbxswap.c index 4c571fec9..cfed6a4c5 100644 --- a/lbx/lbxswap.c +++ b/lbx/lbxswap.c @@ -47,6 +47,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/lbx/lbxswap.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <sys/types.h> #define NEED_REPLIES #define NEED_EVENTS diff --git a/lbx/lbxtables.c b/lbx/lbxtables.c index 26a635f6f..5e8174eeb 100644 --- a/lbx/lbxtables.c +++ b/lbx/lbxtables.c @@ -22,6 +22,10 @@ * */ /* $XFree86: xc/programs/Xserver/lbx/lbxtables.c,v 1.2 2000/05/18 23:46:24 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "dix.h" extern int ProcInitialConnection(ClientPtr client); diff --git a/lbx/lbxtags.c b/lbx/lbxtags.c index 3fb654e38..10a7ca4bb 100644 --- a/lbx/lbxtags.c +++ b/lbx/lbxtags.c @@ -48,6 +48,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/lbx/lbxtags.c,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "lbxdata.h" diff --git a/lbx/lbxtags.h b/lbx/lbxtags.h index aef093448..8577bd93c 100644 --- a/lbx/lbxtags.h +++ b/lbx/lbxtags.h @@ -48,6 +48,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/lbx/lbxtags.h,v 1.3 2001/01/17 22:37:00 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _LBXTAGS_H_ #define _LBXTAGS_H_ #include "lbxserve.h" diff --git a/lbx/lbxzerorep.c b/lbx/lbxzerorep.c index 7ca126c25..e376908c0 100644 --- a/lbx/lbxzerorep.c +++ b/lbx/lbxzerorep.c @@ -36,6 +36,10 @@ from The Open Group. */ #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> diff --git a/mfb/fastblt.h b/mfb/fastblt.h index f25541f55..08846a41f 100644 --- a/mfb/fastblt.h +++ b/mfb/fastblt.h @@ -47,6 +47,10 @@ from The Open Group. #define SwitchEven(n) case n: BodyEven(n) /* to allow mfb and cfb to share code... */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef BitRight #define BitRight(a,b) SCRRIGHT(a,b) #define BitLeft(a,b) SCRLEFT(a,b) diff --git a/mfb/maskbits.c b/mfb/maskbits.c index 0264dd45b..d2a90962d 100644 --- a/mfb/maskbits.c +++ b/mfb/maskbits.c @@ -50,6 +50,10 @@ SOFTWARE. */ /* $XFree86: xc/programs/Xserver/mfb/maskbits.c,v 1.5 2001/01/17 22:37:01 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "maskbits.h" #include "servermd.h" diff --git a/mfb/maskbits.h b/mfb/maskbits.h index fa5ffca4d..ed5cc2687 100644 --- a/mfb/maskbits.h +++ b/mfb/maskbits.h @@ -24,6 +24,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: maskbits.h,v 1.3 2000/08/17 19:53:34 cpqbld Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/mfb/mergerop.h b/mfb/mergerop.h index ba699466c..c8652eb81 100644 --- a/mfb/mergerop.h +++ b/mfb/mergerop.h @@ -27,6 +27,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/mfb/mergerop.h,v 3.13 2001/10/28 03:34:13 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _MERGEROP_H_ #define _MERGEROP_H_ @@ -48,6 +48,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfb.h,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #if !defined(_MFB_H_) || defined(MFB_PROTOTYPES_ONLY) #ifndef MFB_PROTOTYPES_ONLY #define _MFB_H_ diff --git a/mfb/mfbbitblt.c b/mfb/mfbbitblt.c index c10f4f988..70e2a9934 100644 --- a/mfb/mfbbitblt.c +++ b/mfb/mfbbitblt.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbbitblt.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> diff --git a/mfb/mfbblt.c b/mfb/mfbblt.c index 6aff98cac..ce77fe22c 100644 --- a/mfb/mfbblt.c +++ b/mfb/mfbblt.c @@ -32,6 +32,10 @@ Author: Keith Packard */ /* $Xorg: mfbblt.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> diff --git a/mfb/mfbbres.c b/mfb/mfbbres.c index 21d867d1c..b16569804 100644 --- a/mfb/mfbbres.c +++ b/mfb/mfbbres.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbbres.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "mfb.h" diff --git a/mfb/mfbbresd.c b/mfb/mfbbresd.c index fa3b43462..0c4a058d4 100644 --- a/mfb/mfbbresd.c +++ b/mfb/mfbbresd.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbbresd.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "mfb.h" diff --git a/mfb/mfbbstore.c b/mfb/mfbbstore.c index d30c67ae7..270aa78fd 100644 --- a/mfb/mfbbstore.c +++ b/mfb/mfbbstore.c @@ -28,6 +28,10 @@ from The Open Group. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "mfb.h" #include <X11/X.h> #include "mibstore.h" diff --git a/mfb/mfbclip.c b/mfb/mfbclip.c index 32e1da934..5501f0d5c 100644 --- a/mfb/mfbclip.c +++ b/mfb/mfbclip.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbclip.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "regionstr.h" #include "pixmapstr.h" diff --git a/mfb/mfbcmap.c b/mfb/mfbcmap.c index 15c73245f..a16964e15 100644 --- a/mfb/mfbcmap.c +++ b/mfb/mfbcmap.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbcmap.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "colormapst.h" diff --git a/mfb/mfbfillarc.c b/mfb/mfbfillarc.c index 4e1e0623d..a5442896f 100644 --- a/mfb/mfbfillarc.c +++ b/mfb/mfbfillarc.c @@ -27,6 +27,10 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: mfbfillarc.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "regionstr.h" diff --git a/mfb/mfbfillrct.c b/mfb/mfbfillrct.c index 13f57e000..ba8a14283 100644 --- a/mfb/mfbfillrct.c +++ b/mfb/mfbfillrct.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbfillrct.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "pixmapstr.h" diff --git a/mfb/mfbfillsp.c b/mfb/mfbfillsp.c index 6c3a2b506..f75ccb18d 100644 --- a/mfb/mfbfillsp.c +++ b/mfb/mfbfillsp.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbfillsp.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "gcstruct.h" diff --git a/mfb/mfbfont.c b/mfb/mfbfont.c index e4ec62cbc..3798cd22b 100644 --- a/mfb/mfbfont.c +++ b/mfb/mfbfont.c @@ -45,11 +45,15 @@ SOFTWARE. */ /* $Xorg: mfbfont.c,v 1.4 2001/02/09 02:05:18 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "mfb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "scrnintstr.h" diff --git a/mfb/mfbgc.c b/mfb/mfbgc.c index 2f46dced7..c9ff20a45 100644 --- a/mfb/mfbgc.c +++ b/mfb/mfbgc.c @@ -46,12 +46,16 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbgc.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "mfb.h" #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "gcstruct.h" #include "windowstr.h" #include "pixmapstr.h" diff --git a/mfb/mfbgetsp.c b/mfb/mfbgetsp.c index bec9fc641..fd6bbeb8d 100644 --- a/mfb/mfbgetsp.c +++ b/mfb/mfbgetsp.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbgetsp.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> diff --git a/mfb/mfbhrzvert.c b/mfb/mfbhrzvert.c index a8f25f127..9a9d20dac 100644 --- a/mfb/mfbhrzvert.c +++ b/mfb/mfbhrzvert.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbhrzvert.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gc.h" diff --git a/mfb/mfbimage.c b/mfb/mfbimage.c index b305a2cd4..299905701 100644 --- a/mfb/mfbimage.c +++ b/mfb/mfbimage.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbimage.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" diff --git a/mfb/mfbimggblt.c b/mfb/mfbimggblt.c index 5f86b4cb5..0c0d4140c 100644 --- a/mfb/mfbimggblt.c +++ b/mfb/mfbimggblt.c @@ -47,11 +47,15 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbimggblt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "mfb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/mfb/mfbline.c b/mfb/mfbline.c index c30deedc7..af7c27874 100644 --- a/mfb/mfbline.c +++ b/mfb/mfbline.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbline.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" diff --git a/mfb/mfbmisc.c b/mfb/mfbmisc.c index d53dc2f73..98db7c1da 100644 --- a/mfb/mfbmisc.c +++ b/mfb/mfbmisc.c @@ -45,6 +45,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbmisc.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> #include "cursor.h" diff --git a/mfb/mfbpixmap.c b/mfb/mfbpixmap.c index 36055643d..c3d5d5ea6 100644 --- a/mfb/mfbpixmap.c +++ b/mfb/mfbpixmap.c @@ -52,6 +52,10 @@ SOFTWARE. on a monchrome device, a pixmap is a bitmap. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/Xmd.h> #include "scrnintstr.h" #include "pixmapstr.h" diff --git a/mfb/mfbply1rct.c b/mfb/mfbply1rct.c index 6c2af609a..9b783f609 100644 --- a/mfb/mfbply1rct.c +++ b/mfb/mfbply1rct.c @@ -28,6 +28,10 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/Xserver/mfb/mfbply1rct.c,v 1.7tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" diff --git a/mfb/mfbplygblt.c b/mfb/mfbplygblt.c index e8bb8cbce..275e8c646 100644 --- a/mfb/mfbplygblt.c +++ b/mfb/mfbplygblt.c @@ -47,11 +47,15 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbplygblt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "mfb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/mfb/mfbpntarea.c b/mfb/mfbpntarea.c index c9aac2c36..0719e4ebd 100644 --- a/mfb/mfbpntarea.c +++ b/mfb/mfbpntarea.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbpntarea.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" diff --git a/mfb/mfbpntwin.c b/mfb/mfbpntwin.c index e6dcdfdca..d1c19b691 100644 --- a/mfb/mfbpntwin.c +++ b/mfb/mfbpntwin.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" diff --git a/mfb/mfbpolypnt.c b/mfb/mfbpolypnt.c index e9cbbe36f..e5ac4c874 100644 --- a/mfb/mfbpolypnt.c +++ b/mfb/mfbpolypnt.c @@ -48,6 +48,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbpolypnt.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "pixmapstr.h" diff --git a/mfb/mfbpushpxl.c b/mfb/mfbpushpxl.c index 511d6c22c..1cbdf9a5b 100644 --- a/mfb/mfbpushpxl.c +++ b/mfb/mfbpushpxl.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbpushpxl.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" #include "scrnintstr.h" diff --git a/mfb/mfbscrclse.c b/mfb/mfbscrclse.c index 12ccf6079..55445932c 100644 --- a/mfb/mfbscrclse.c +++ b/mfb/mfbscrclse.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/mfb/mfbscrclse.c,v 1.3tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "mfb.h" #include "scrnintstr.h" diff --git a/mfb/mfbscrinit.c b/mfb/mfbscrinit.c index 2e83c9b6e..9defac1df 100644 --- a/mfb/mfbscrinit.c +++ b/mfb/mfbscrinit.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbscrinit.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> /* for xColorItem */ #include <X11/Xmd.h> diff --git a/mfb/mfbsetsp.c b/mfb/mfbsetsp.c index f796fd742..d681bc37b 100644 --- a/mfb/mfbsetsp.c +++ b/mfb/mfbsetsp.c @@ -48,6 +48,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbsetsp.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> diff --git a/mfb/mfbtegblt.c b/mfb/mfbtegblt.c index 455e44c1b..ac22aee0c 100644 --- a/mfb/mfbtegblt.c +++ b/mfb/mfbtegblt.c @@ -49,11 +49,15 @@ SOFTWARE. /* $XFree86: xc/programs/Xserver/mfb/mfbtegblt.c,v 1.7 2001/01/17 22:37:03 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "mfb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/mfb/mfbtile.c b/mfb/mfbtile.c index 25a820b9a..ecfa06952 100644 --- a/mfb/mfbtile.c +++ b/mfb/mfbtile.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mfbtile.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" diff --git a/mfb/mfbwindow.c b/mfb/mfbwindow.c index 1f277e4b4..56f3f468a 100644 --- a/mfb/mfbwindow.c +++ b/mfb/mfbwindow.c @@ -48,6 +48,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" diff --git a/mfb/mfbzerarc.c b/mfb/mfbzerarc.c index 54d61bad1..92fd81dfb 100644 --- a/mfb/mfbzerarc.c +++ b/mfb/mfbzerarc.c @@ -33,6 +33,10 @@ in this Software without prior written authorization from The Open Group. * The Computer Journal, November 1967, Volume 10, Number 3, pp. 282-289 */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "regionstr.h" @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/mi/mi.h,v 3.9 2001/08/06 20:51:16 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef MI_H #define MI_H #include <X11/X.h> @@ -54,7 +58,7 @@ SOFTWARE. #include "validate.h" #include "window.h" #include "gc.h" -#include "font.h" +#include <X11/fonts/font.h> #include "input.h" #include "cursor.h" diff --git a/mi/miarc.c b/mi/miarc.c index 0ab98d54e..a1057788d 100644 --- a/mi/miarc.c +++ b/mi/miarc.c @@ -50,6 +50,10 @@ SOFTWARE. /* Author: Keith Packard and Bob Scheifler */ /* Warning: this code is toxic, do not dally very long here. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \ || (defined(sun) && defined(__SVR4)) #include <math.h> diff --git a/mi/mibank.c b/mi/mibank.c index 1f1087b88..b09f9fd7c 100644 --- a/mi/mibank.c +++ b/mi/mibank.c @@ -77,6 +77,10 @@ /* #define NO_ALLOCA 1 */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "servermd.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/mi/mibank.h b/mi/mibank.h index cf27d1fae..fb44ccc9b 100644 --- a/mi/mibank.h +++ b/mi/mibank.h @@ -22,6 +22,10 @@ /* $XFree86: xc/programs/Xserver/mi/mibank.h,v 1.10 2003/01/01 19:16:42 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef __MIBANK_H__ #define __MIBANK_H__ 1 diff --git a/mi/mibitblt.c b/mi/mibitblt.c index 58a59c826..fe60b59ba 100644 --- a/mi/mibitblt.c +++ b/mi/mibitblt.c @@ -48,6 +48,10 @@ SOFTWARE. /* $Xorg: mibitblt.c,v 1.5 2001/02/09 02:05:20 xorgcvs Exp $ */ /* Author: Todd Newman (aided and abetted by Mr. Drewry) */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> diff --git a/mi/mibstore.c b/mi/mibstore.c index 7be84ef82..6db860d72 100644 --- a/mi/mibstore.c +++ b/mi/mibstore.c @@ -45,6 +45,10 @@ implied warranty. /* $XFree86: xc/programs/Xserver/mi/mibstore.c,v 1.10tsi Exp $ */ #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> @@ -54,7 +58,7 @@ implied warranty. #include "gcstruct.h" #include "windowstr.h" #include "pixmapstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "dixstruct.h" /* For requestingClient */ #include "mi.h" diff --git a/mi/mibstore.h b/mi/mibstore.h index fb58975c6..366757f76 100644 --- a/mi/mibstore.h +++ b/mi/mibstore.h @@ -18,6 +18,10 @@ /* $XFree86: xc/programs/Xserver/mi/mibstore.h,v 1.4 2001/01/17 22:37:06 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _MIBSTORE_H #define _MIBSTORE_H diff --git a/mi/mibstorest.h b/mi/mibstorest.h index fec3c9712..787b9d4f4 100644 --- a/mi/mibstorest.h +++ b/mi/mibstorest.h @@ -33,6 +33,10 @@ in this Software without prior written authorization from The Open Group. /* $XFree86: xc/programs/Xserver/mi/mibstorest.h,v 1.4 2001/01/17 22:37:06 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "mibstore.h" #include "regionstr.h" diff --git a/mi/miclipn.c b/mi/miclipn.c index e9f43ab2a..14ff0d69a 100644 --- a/mi/miclipn.c +++ b/mi/miclipn.c @@ -28,6 +28,10 @@ from The Open Group. */ /* $XFree86: xc/programs/Xserver/mi/miclipn.c,v 1.3 2001/08/06 21:46:04 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" #include "scrnintstr.h" diff --git a/mi/micmap.c b/mi/micmap.c index 1f3c67dae..98f3e521d 100644 --- a/mi/micmap.c +++ b/mi/micmap.c @@ -36,6 +36,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "scrnintstr.h" diff --git a/mi/micmap.h b/mi/micmap.h index ca2a417be..df5f6dc9a 100644 --- a/mi/micmap.h +++ b/mi/micmap.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/mi/micmap.h,v 1.5 1999/06/14 07:32:11 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "colormapst.h" #ifndef _MICMAP_H_ diff --git a/mi/micoord.h b/mi/micoord.h index e4b242475..9521fe0fe 100644 --- a/mi/micoord.h +++ b/mi/micoord.h @@ -26,6 +26,10 @@ * */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _MICOORD_H_ #define _MICOORD_H_ 1 diff --git a/mi/micursor.c b/mi/micursor.c index 8339e2230..ce5778c37 100644 --- a/mi/micursor.c +++ b/mi/micursor.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: micursor.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "scrnintstr.h" #include "cursor.h" #include <X11/misc.h> diff --git a/mi/midash.c b/mi/midash.c index 0152db7ca..5def4d9c8 100644 --- a/mi/midash.c +++ b/mi/midash.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: midash.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "regionstr.h" #include "mistruct.h" #include "mifpoly.h" diff --git a/mi/midispcur.c b/mi/midispcur.c index 2c3cfced4..007ae2519 100644 --- a/mi/midispcur.c +++ b/mi/midispcur.c @@ -45,6 +45,10 @@ in this Software without prior written authorization from The Open Group. # include "mipointer.h" # include "misprite.h" # include "gcstruct.h" +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef ARGB_CURSOR # include "picturestr.h" #endif diff --git a/mi/miexpose.c b/mi/miexpose.c index 1750de116..fdd2025ec 100644 --- a/mi/miexpose.c +++ b/mi/miexpose.c @@ -76,6 +76,10 @@ Equipment Corporation. /* $Xorg: miexpose.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #define NEED_EVENTS #include <X11/Xproto.h> diff --git a/mi/mifillarc.c b/mi/mifillarc.c index d49ae1d92..0dcf25d05 100644 --- a/mi/mifillarc.c +++ b/mi/mifillarc.c @@ -29,6 +29,10 @@ Author: Bob Scheifler, MIT X Consortium /* $Xorg: mifillarc.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <math.h> #include <X11/X.h> #include <X11/Xprotostr.h> diff --git a/mi/mifillarc.h b/mi/mifillarc.h index ff39bac1d..52ea00272 100644 --- a/mi/mifillarc.h +++ b/mi/mifillarc.h @@ -27,6 +27,10 @@ in this Software without prior written authorization from The Open Group. /* $Xorg: mifillarc.h,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef __MIFILLARC_H__ #define __MIFILLARC_H__ diff --git a/mi/mifillrct.c b/mi/mifillrct.c index efaadae59..06d448f9e 100644 --- a/mi/mifillrct.c +++ b/mi/mifillrct.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mifillrct.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "gcstruct.h" diff --git a/mi/mifpoly.h b/mi/mifpoly.h index 79f606b4d..a1521c656 100644 --- a/mi/mifpoly.h +++ b/mi/mifpoly.h @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/mi/mifpoly.h,v 1.3 2001/10/25 12:03:47 alanh Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef __MIFPOLY_H__ #define __MIFPOLY_H__ diff --git a/mi/mifpolycon.c b/mi/mifpolycon.c index d659c7967..40b83586f 100644 --- a/mi/mifpolycon.c +++ b/mi/mifpolycon.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mifpolycon.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <math.h> #include <X11/X.h> #include "gcstruct.h" @@ -29,6 +29,10 @@ from The Open Group. /* $XFree86: xc/programs/Xserver/mi/migc.c,v 1.8 2001/08/06 20:51:18 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "scrnintstr.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/mi/miglblt.c b/mi/miglblt.c index b1ae60250..12d0aa932 100644 --- a/mi/miglblt.c +++ b/mi/miglblt.c @@ -48,11 +48,15 @@ SOFTWARE. /* $Xorg: miglblt.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "misc.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" diff --git a/mi/miinitext.c b/mi/miinitext.c index 12d6ddbde..48e533805 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -48,6 +48,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: miinitext.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/misc.h> #include "extension.h" #include "micmap.h" diff --git a/mi/miline.h b/mi/miline.h index f52a51ebd..a856038f5 100644 --- a/mi/miline.h +++ b/mi/miline.h @@ -27,6 +27,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/mi/miline.h,v 1.6 2001/08/06 20:51:19 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef MILINE_H #include "screenint.h" diff --git a/mi/mioverlay.c b/mi/mioverlay.c index dfdfdecd7..545927b53 100644 --- a/mi/mioverlay.c +++ b/mi/mioverlay.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/mi/mioverlay.c,v 3.15tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "validate.h" diff --git a/mi/mioverlay.h b/mi/mioverlay.h index 64045f45c..a1d1e1a18 100644 --- a/mi/mioverlay.h +++ b/mi/mioverlay.h @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/mi/mioverlay.h,v 3.3 2000/02/29 00:16:03 mvojkovi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef __MIOVERLAY_H #define __MIOVERLAY_H diff --git a/mi/mipointer.c b/mi/mipointer.c index 85474f692..db6f8bce9 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -527,6 +527,10 @@ _miRegisterPointerDevice (pScreen, pDevice) } /* obsolete: for binary compatibility */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef miRegisterPointerDevice #undef miRegisterPointerDevice void diff --git a/mi/mipointer.h b/mi/mipointer.h index f8e7fd084..747954893 100644 --- a/mi/mipointer.h +++ b/mi/mipointer.h @@ -31,6 +31,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/mi/mipointer.h,v 3.8 2001/08/06 20:51:19 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef MIPOINTER_H #define MIPOINTER_H diff --git a/mi/mipointrst.h b/mi/mipointrst.h index 682f8ac88..b4dd2f604 100644 --- a/mi/mipointrst.h +++ b/mi/mipointrst.h @@ -31,6 +31,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/mi/mipointrst.h,v 1.3 2001/04/19 14:14:07 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "mipointer.h" #include "scrnintstr.h" diff --git a/mi/mipoly.c b/mi/mipoly.c index 138552d14..403d3da56 100644 --- a/mi/mipoly.c +++ b/mi/mipoly.c @@ -56,6 +56,10 @@ SOFTWARE. * to the appropriate routine to actually scan convert the * polygon. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "windowstr.h" #include "gcstruct.h" diff --git a/mi/mipolycon.c b/mi/mipolycon.c index de33045ef..10c43a78e 100644 --- a/mi/mipolycon.c +++ b/mi/mipolycon.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mipolycon.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "gcstruct.h" #include "pixmap.h" #include "mi.h" diff --git a/mi/mipolygen.c b/mi/mipolygen.c index d63dfaec2..c3d9ef397 100644 --- a/mi/mipolygen.c +++ b/mi/mipolygen.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mipolygen.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" #include "miscanfill.h" diff --git a/mi/mipolypnt.c b/mi/mipolypnt.c index eec246df5..5d615c28d 100644 --- a/mi/mipolypnt.c +++ b/mi/mipolypnt.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mipolypnt.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "pixmapstr.h" diff --git a/mi/mipolyrect.c b/mi/mipolyrect.c index 6976f7d3c..6740ea8f6 100644 --- a/mi/mipolyrect.c +++ b/mi/mipolyrect.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mipolyrect.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "regionstr.h" diff --git a/mi/mipolyseg.c b/mi/mipolyseg.c index bb9259450..dcf3d815a 100644 --- a/mi/mipolyseg.c +++ b/mi/mipolyseg.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mipolyseg.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xprotostr.h> #include "regionstr.h" diff --git a/mi/mipolytext.c b/mi/mipolytext.c index d36fbd22a..c2bbaba38 100644 --- a/mi/mipolytext.c +++ b/mi/mipolytext.c @@ -55,12 +55,16 @@ SOFTWARE. * Date: Thu Feb 5 1987 */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> #include "misc.h" #include "gcstruct.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "mi.h" diff --git a/mi/mipolyutil.c b/mi/mipolyutil.c index b59691431..8bb736c94 100644 --- a/mi/mipolyutil.c +++ b/mi/mipolyutil.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mipolyutil.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "regionstr.h" #include "gc.h" #include "miscanfill.h" diff --git a/mi/mipushpxl.c b/mi/mipushpxl.c index 49409a247..5fce1cae7 100644 --- a/mi/mipushpxl.c +++ b/mi/mipushpxl.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mipushpxl.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "gcstruct.h" #include "scrnintstr.h" diff --git a/mi/miregion.c b/mi/miregion.c index ddb59fc2d..df3324865 100644 --- a/mi/miregion.c +++ b/mi/miregion.c @@ -77,6 +77,10 @@ Equipment Corporation. ******************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "regionstr.h" #include <X11/Xprotostr.h> #include "gc.h" diff --git a/mi/miscanfill.h b/mi/miscanfill.h index 06baee399..49058c1c9 100644 --- a/mi/miscanfill.h +++ b/mi/miscanfill.h @@ -28,6 +28,10 @@ from The Open Group. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef SCANFILLINCLUDED #define SCANFILLINCLUDED /* diff --git a/mi/miscrinit.c b/mi/miscrinit.c index 2bb58b54a..b6d8c3dbd 100644 --- a/mi/miscrinit.c +++ b/mi/miscrinit.c @@ -28,6 +28,10 @@ from The Open Group. */ /* $XFree86: xc/programs/Xserver/mi/miscrinit.c,v 3.15tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "servermd.h" #include <X11/misc.h> diff --git a/mi/mispans.c b/mi/mispans.c index 6885af2be..c0b40b8da 100644 --- a/mi/mispans.c +++ b/mi/mispans.c @@ -48,6 +48,10 @@ SOFTWARE. /* $Xorg: mispans.c,v 1.4 2001/02/09 02:05:21 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/misc.h> #include "pixmapstr.h" #include "gcstruct.h" diff --git a/mi/misprite.c b/mi/misprite.c index 64fd04eb5..6c1ed1bb3 100644 --- a/mi/misprite.c +++ b/mi/misprite.c @@ -39,7 +39,7 @@ in this Software without prior written authorization from The Open Group. # include "input.h" # include "mi.h" # include "cursorstr.h" -# include "font.h" +# include <X11/fonts/font.h> # include "scrnintstr.h" # include "colormapst.h" # include "windowstr.h" @@ -47,7 +47,11 @@ in this Software without prior written authorization from The Open Group. # include "mipointer.h" # include "mispritest.h" # include "dixfontstr.h" -# include "fontstruct.h" +# include <X11/fonts/fontstruct.h> +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef RENDER # include "mipict.h" #endif diff --git a/mi/mispritest.h b/mi/mispritest.h index 7312d2476..dca1fa619 100644 --- a/mi/mispritest.h +++ b/mi/mispritest.h @@ -32,6 +32,10 @@ in this Software without prior written authorization from The Open Group. */ /* $XFree86: xc/programs/Xserver/mi/mispritest.h,v 1.4 2001/01/17 22:37:07 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _MISPRITEST_H_ #define _MISPRITEST_H_ diff --git a/mi/mistruct.h b/mi/mistruct.h index 98879b72d..36a810703 100644 --- a/mi/mistruct.h +++ b/mi/mistruct.h @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef MISTRUCT_H #define MISTRUCT_H diff --git a/mi/mivalidate.h b/mi/mivalidate.h index c25e5d5bc..612b67e1d 100644 --- a/mi/mivalidate.h +++ b/mi/mivalidate.h @@ -29,6 +29,10 @@ from The Open Group. /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef MIVALIDATE_H #define MIVALIDATE_H diff --git a/mi/mivaltree.c b/mi/mivaltree.c index d9e711777..6a7d6030c 100644 --- a/mi/mivaltree.c +++ b/mi/mivaltree.c @@ -92,6 +92,10 @@ Equipment Corporation. * Bob Scheifler -- avoid miComputeClips for unmapped windows, * valdata changes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "validate.h" diff --git a/mi/miwideline.c b/mi/miwideline.c index 606ccd43a..44cf18f2e 100644 --- a/mi/miwideline.c +++ b/mi/miwideline.c @@ -35,6 +35,10 @@ from The Open Group. * bresenham zero-width lines, except walks an X edge */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #ifdef _XOPEN_SOURCE #include <math.h> diff --git a/mi/miwideline.h b/mi/miwideline.h index 96d6aae86..cdfe624db 100644 --- a/mi/miwideline.h +++ b/mi/miwideline.h @@ -30,6 +30,10 @@ from The Open Group. /* Author: Keith Packard, MIT X Consortium */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "mispans.h" #include "mifpoly.h" /* for ICEIL */ diff --git a/mi/miwindow.c b/mi/miwindow.c index 1ebb0cee2..280d0f8eb 100644 --- a/mi/miwindow.c +++ b/mi/miwindow.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: miwindow.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "regionstr.h" #include "region.h" diff --git a/mi/mizerarc.c b/mi/mizerarc.c index 282bf6df8..62402f41b 100644 --- a/mi/mizerarc.c +++ b/mi/mizerarc.c @@ -35,6 +35,10 @@ Author: Bob Scheifler, MIT X Consortium * The Computer Journal, November 1967, Volume 10, Number 3, pp. 282-289 */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <math.h> #include <X11/X.h> #include <X11/Xprotostr.h> diff --git a/mi/mizerclip.c b/mi/mizerclip.c index 1315fd244..9c9a07e6d 100644 --- a/mi/mizerclip.c +++ b/mi/mizerclip.c @@ -45,6 +45,10 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> diff --git a/mi/mizerline.c b/mi/mizerline.c index ad9e17b46..c88b62e81 100644 --- a/mi/mizerline.c +++ b/mi/mizerline.c @@ -46,6 +46,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: mizerline.c,v 1.4 2001/02/09 02:05:22 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> diff --git a/miext/cw/cw.c b/miext/cw/cw.c index 72f96e13e..2b8010f50 100644 --- a/miext/cw/cw.c +++ b/miext/cw/cw.c @@ -21,6 +21,10 @@ */ /* $Header$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "gcstruct.h" #include "windowstr.h" #include "cw.h" diff --git a/miext/cw/cw.h b/miext/cw/cw.h index 20be80205..1f8c400e2 100644 --- a/miext/cw/cw.h +++ b/miext/cw/cw.h @@ -21,6 +21,10 @@ */ /* $Header$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "picturestr.h" /* diff --git a/miext/cw/cw_ops.c b/miext/cw/cw_ops.c index 9df12d6d0..80168a336 100644 --- a/miext/cw/cw_ops.c +++ b/miext/cw/cw_ops.c @@ -21,6 +21,10 @@ */ /* $Header$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "gcstruct.h" #include "cw.h" diff --git a/miext/cw/cw_render.c b/miext/cw/cw_render.c index 73d893b16..82ca006d2 100644 --- a/miext/cw/cw_render.c +++ b/miext/cw/cw_render.c @@ -21,6 +21,10 @@ */ /* $Header$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "gcstruct.h" #include "windowstr.h" #include "cw.h" diff --git a/miext/damage/damage.c b/miext/damage/damage.c index 31238cc4a..dfebffe90 100755 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -22,15 +22,19 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mi.h" #include "regionstr.h" #include "globals.h" diff --git a/miext/damage/damage.h b/miext/damage/damage.h index 7ed1b1823..c760f6bef 100755 --- a/miext/damage/damage.h +++ b/miext/damage/damage.h @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _DAMAGE_H_ #define _DAMAGE_H_ diff --git a/miext/damage/damagestr.h b/miext/damage/damagestr.h index 39b50660a..772a7ec35 100755 --- a/miext/damage/damagestr.h +++ b/miext/damage/damagestr.h @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _DAMAGESTR_H_ #define _DAMAGESTR_H_ diff --git a/miext/layer/layer.h b/miext/layer/layer.h index 1cb410e4c..e8f3a856e 100644 --- a/miext/layer/layer.h +++ b/miext/layer/layer.h @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _LAYER_H_ #define _LAYER_H_ diff --git a/miext/layer/layergc.c b/miext/layer/layergc.c index b0153b49b..343edfcf5 100644 --- a/miext/layer/layergc.c +++ b/miext/layer/layergc.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "layerstr.h" GCFuncs layerGCFuncs = { diff --git a/miext/layer/layerinit.c b/miext/layer/layerinit.c index 615bed361..994c6747c 100644 --- a/miext/layer/layerinit.c +++ b/miext/layer/layerinit.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "layerstr.h" int layerScrPrivateIndex; diff --git a/miext/layer/layerpict.c b/miext/layer/layerpict.c index 1719edd7b..16e46f0ab 100644 --- a/miext/layer/layerpict.c +++ b/miext/layer/layerpict.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "layerstr.h" void diff --git a/miext/layer/layerstr.h b/miext/layer/layerstr.h index 91393adc4..fb5a0d411 100644 --- a/miext/layer/layerstr.h +++ b/miext/layer/layerstr.h @@ -22,15 +22,19 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _LAYERSTR_H_ #define _LAYERSTR_H_ #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mi.h" #include "regionstr.h" #include "globals.h" diff --git a/miext/layer/layerwin.c b/miext/layer/layerwin.c index 1119e6048..7afe90ade 100644 --- a/miext/layer/layerwin.c +++ b/miext/layer/layerwin.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "layerstr.h" static LayerListPtr diff --git a/miext/rootless/accel/rlAccel.c b/miext/rootless/accel/rlAccel.c index 0b8152857..188fd4872 100644 --- a/miext/rootless/accel/rlAccel.c +++ b/miext/rootless/accel/rlAccel.c @@ -35,6 +35,10 @@ * underneath this layer besides fb will get called. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "rootless.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlAccel.h b/miext/rootless/accel/rlAccel.h index b1488bdef..a4402bdf2 100644 --- a/miext/rootless/accel/rlAccel.h +++ b/miext/rootless/accel/rlAccel.h @@ -28,6 +28,10 @@ */ /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.c,v 1.4 2003/10/18 00:00:34 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" /* diff --git a/miext/rootless/accel/rlBlt.c b/miext/rootless/accel/rlBlt.c index ad4ebf199..e5fa5f7bd 100644 --- a/miext/rootless/accel/rlBlt.c +++ b/miext/rootless/accel/rlBlt.c @@ -28,6 +28,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbblt.c,v 1.8 2000/09/28 00:47:22 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #include "rootlessCommon.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlCopy.c b/miext/rootless/accel/rlCopy.c index 46bca34f9..ccea7fbd3 100644 --- a/miext/rootless/accel/rlCopy.c +++ b/miext/rootless/accel/rlCopy.c @@ -24,6 +24,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbcopy.c,v 1.12 2001/07/16 05:04:05 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlFill.c b/miext/rootless/accel/rlFill.c index 4409663c0..a6ed2fbbb 100644 --- a/miext/rootless/accel/rlFill.c +++ b/miext/rootless/accel/rlFill.c @@ -24,6 +24,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbfill.c,v 1.6 2003/01/31 00:01:45 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlFillRect.c b/miext/rootless/accel/rlFillRect.c index 34789aa27..e4bab4f53 100644 --- a/miext/rootless/accel/rlFillRect.c +++ b/miext/rootless/accel/rlFillRect.c @@ -24,6 +24,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbfillrect.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlFillSpans.c b/miext/rootless/accel/rlFillSpans.c index 18a61a944..9942d70e4 100644 --- a/miext/rootless/accel/rlFillSpans.c +++ b/miext/rootless/accel/rlFillSpans.c @@ -24,6 +24,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbfillsp.c,v 1.2 2000/02/23 20:29:43 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlGlyph.c b/miext/rootless/accel/rlGlyph.c index 775032ed4..3f1571963 100644 --- a/miext/rootless/accel/rlGlyph.c +++ b/miext/rootless/accel/rlGlyph.c @@ -24,8 +24,12 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.12 2001/09/07 15:16:00 keithp Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "dixfontstr.h" #include "rlAccel.h" diff --git a/miext/rootless/accel/rlSolid.c b/miext/rootless/accel/rlSolid.c index 15aa2ae43..edce3d2c4 100644 --- a/miext/rootless/accel/rlSolid.c +++ b/miext/rootless/accel/rlSolid.c @@ -28,6 +28,10 @@ */ /* $XFree86: xc/programs/Xserver/fb/fbsolid.c,v 1.8 2001/10/28 03:33:08 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "fb.h" #include "rootlessCommon.h" diff --git a/miext/rootless/rootless.h b/miext/rootless/rootless.h index 7612f00fa..dec0e2c64 100644 --- a/miext/rootless/rootless.h +++ b/miext/rootless/rootless.h @@ -29,6 +29,10 @@ */ /* $XFree86: xc/programs/Xserver/miext/rootless/rootless.h,v 1.7 2004/07/02 01:30:33 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _ROOTLESS_H #define _ROOTLESS_H diff --git a/miext/rootless/rootlessCommon.c b/miext/rootless/rootlessCommon.c index b24d2a226..33321105e 100644 --- a/miext/rootless/rootlessCommon.c +++ b/miext/rootless/rootlessCommon.c @@ -30,6 +30,10 @@ */ /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.c,v 1.6 2004/07/02 01:30:33 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "rootlessCommon.h" unsigned int rootless_CopyBytes_threshold = 0; diff --git a/miext/rootless/rootlessCommon.h b/miext/rootless/rootlessCommon.h index b5fcae7f9..beb1fd666 100644 --- a/miext/rootless/rootlessCommon.h +++ b/miext/rootless/rootlessCommon.h @@ -29,6 +29,10 @@ */ /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessCommon.h,v 1.5 2004/07/02 01:30:33 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _ROOTLESSCOMMON_H #define _ROOTLESSCOMMON_H diff --git a/miext/rootless/rootlessConfig.h b/miext/rootless/rootlessConfig.h index ccd0cc776..eabbaef43 100644 --- a/miext/rootless/rootlessConfig.h +++ b/miext/rootless/rootlessConfig.h @@ -28,6 +28,10 @@ */ /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessConfig.h,v 1.1 2003/04/15 01:05:44 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _ROOTLESSCONFIG_H #define _ROOTLESSCONFIG_H diff --git a/miext/rootless/rootlessGC.c b/miext/rootless/rootlessGC.c index fa10241f2..61987addb 100644 --- a/miext/rootless/rootlessGC.c +++ b/miext/rootless/rootlessGC.c @@ -30,6 +30,10 @@ */ /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessGC.c,v 1.1 2003/04/15 01:05:44 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "mi.h" #include "scrnintstr.h" #include "gcstruct.h" diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c index 21c62c4ef..6b7697383 100644 --- a/miext/rootless/rootlessScreen.c +++ b/miext/rootless/rootlessScreen.c @@ -31,6 +31,10 @@ /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessScreen.c,v 1.2 2003/04/30 23:15:35 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "mi.h" #include "scrnintstr.h" #include "gcstruct.h" diff --git a/miext/rootless/rootlessValTree.c b/miext/rootless/rootlessValTree.c index 51a2e99ad..2717ddf6f 100644 --- a/miext/rootless/rootlessValTree.c +++ b/miext/rootless/rootlessValTree.c @@ -90,6 +90,10 @@ Equipment Corporation. * Bob Scheifler -- avoid miComputeClips for unmapped windows, * valdata changes */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "validate.h" diff --git a/miext/rootless/rootlessWindow.c b/miext/rootless/rootlessWindow.c index 505db5ad5..f105a9113 100644 --- a/miext/rootless/rootlessWindow.c +++ b/miext/rootless/rootlessWindow.c @@ -31,6 +31,10 @@ */ /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.c,v 1.12 2004/07/02 01:30:33 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "rootlessCommon.h" #include "rootlessWindow.h" diff --git a/miext/rootless/rootlessWindow.h b/miext/rootless/rootlessWindow.h index 6c26bace3..9cceed347 100644 --- a/miext/rootless/rootlessWindow.h +++ b/miext/rootless/rootlessWindow.h @@ -28,6 +28,10 @@ */ /* $XFree86: xc/programs/Xserver/miext/rootless/rootlessWindow.h,v 1.1 2003/04/15 01:05:44 torrey Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _ROOTLESSWINDOW_H #define _ROOTLESSWINDOW_H diff --git a/miext/shadow/shadow.c b/miext/shadow/shadow.c index 2c2a26201..46ddfbb6c 100644 --- a/miext/shadow/shadow.c +++ b/miext/shadow/shadow.c @@ -23,12 +23,16 @@ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mi.h" #include "regionstr.h" #include "globals.h" diff --git a/miext/shadow/shadow.h b/miext/shadow/shadow.h index 85b2604f5..3d50b5a84 100644 --- a/miext/shadow/shadow.h +++ b/miext/shadow/shadow.h @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _SHADOW_H_ #define _SHADOW_H_ diff --git a/miext/shadow/shalloc.c b/miext/shadow/shalloc.c index 0514b9a2e..5c01f2aac 100644 --- a/miext/shadow/shalloc.c +++ b/miext/shadow/shalloc.c @@ -23,12 +23,16 @@ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mi.h" #include "regionstr.h" #include "globals.h" diff --git a/miext/shadow/shpacked.c b/miext/shadow/shpacked.c index 5a19bcc4b..3fdee1473 100644 --- a/miext/shadow/shpacked.c +++ b/miext/shadow/shpacked.c @@ -22,12 +22,16 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mi.h" #include "regionstr.h" #include "globals.h" diff --git a/miext/shadow/shplanar.c b/miext/shadow/shplanar.c index e9fc784b4..979905b86 100644 --- a/miext/shadow/shplanar.c +++ b/miext/shadow/shplanar.c @@ -22,12 +22,16 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mi.h" #include "regionstr.h" #include "globals.h" diff --git a/miext/shadow/shplanar8.c b/miext/shadow/shplanar8.c index f2a2215ed..f1d87dc50 100644 --- a/miext/shadow/shplanar8.c +++ b/miext/shadow/shplanar8.c @@ -22,12 +22,16 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mi.h" #include "regionstr.h" #include "globals.h" diff --git a/miext/shadow/shrot16pack.c b/miext/shadow/shrot16pack.c index 0928464f2..2ec41bb07 100644 --- a/miext/shadow/shrot16pack.c +++ b/miext/shadow/shrot16pack.c @@ -25,4 +25,8 @@ #define FUNC shadowUpdateRotate16 #define Data CARD16 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrot16pack_180.c b/miext/shadow/shrot16pack_180.c index d51511260..06b1603ba 100644 --- a/miext/shadow/shrot16pack_180.c +++ b/miext/shadow/shrot16pack_180.c @@ -26,4 +26,8 @@ #define Data CARD16 #define ROTATE 180 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrot16pack_270.c b/miext/shadow/shrot16pack_270.c index ea22717b0..1ad952ec6 100644 --- a/miext/shadow/shrot16pack_270.c +++ b/miext/shadow/shrot16pack_270.c @@ -26,4 +26,8 @@ #define Data CARD16 #define ROTATE 270 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrot16pack_90.c b/miext/shadow/shrot16pack_90.c index 71027d92a..cfef7785c 100644 --- a/miext/shadow/shrot16pack_90.c +++ b/miext/shadow/shrot16pack_90.c @@ -26,4 +26,8 @@ #define Data CARD16 #define ROTATE 90 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrot32pack.c b/miext/shadow/shrot32pack.c index 1415bab80..95c7c292c 100644 --- a/miext/shadow/shrot32pack.c +++ b/miext/shadow/shrot32pack.c @@ -25,4 +25,8 @@ #define FUNC shadowUpdateRotate32 #define Data CARD32 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrot32pack_180.c b/miext/shadow/shrot32pack_180.c index 003aeecd8..cbadba59d 100644 --- a/miext/shadow/shrot32pack_180.c +++ b/miext/shadow/shrot32pack_180.c @@ -26,4 +26,8 @@ #define Data CARD32 #define ROTATE 180 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrot32pack_270.c b/miext/shadow/shrot32pack_270.c index 4f1f0d31f..8f434b08e 100644 --- a/miext/shadow/shrot32pack_270.c +++ b/miext/shadow/shrot32pack_270.c @@ -26,4 +26,8 @@ #define Data CARD32 #define ROTATE 270 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrot32pack_90.c b/miext/shadow/shrot32pack_90.c index 7c3e781a8..98c22c37d 100644 --- a/miext/shadow/shrot32pack_90.c +++ b/miext/shadow/shrot32pack_90.c @@ -26,4 +26,8 @@ #define Data CARD32 #define ROTATE 90 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrot8pack.c b/miext/shadow/shrot8pack.c index c59bc2078..9e77f43e8 100644 --- a/miext/shadow/shrot8pack.c +++ b/miext/shadow/shrot8pack.c @@ -25,4 +25,8 @@ #define FUNC shadowUpdateRotate8 #define Data CARD8 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrot8pack_180.c b/miext/shadow/shrot8pack_180.c index 095843f13..6f4eca93e 100644 --- a/miext/shadow/shrot8pack_180.c +++ b/miext/shadow/shrot8pack_180.c @@ -26,4 +26,8 @@ #define Data CARD8 #define ROTATE 180 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrot8pack_270.c b/miext/shadow/shrot8pack_270.c index f558538ff..d56a3366c 100644 --- a/miext/shadow/shrot8pack_270.c +++ b/miext/shadow/shrot8pack_270.c @@ -26,4 +26,8 @@ #define Data CARD8 #define ROTATE 270 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrot8pack_90.c b/miext/shadow/shrot8pack_90.c index 108552f42..2fed8126d 100644 --- a/miext/shadow/shrot8pack_90.c +++ b/miext/shadow/shrot8pack_90.c @@ -26,4 +26,8 @@ #define Data CARD8 #define ROTATE 90 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "shrotpack.h" diff --git a/miext/shadow/shrotate.c b/miext/shadow/shrotate.c index f870ef05c..927bc61be 100644 --- a/miext/shadow/shrotate.c +++ b/miext/shadow/shrotate.c @@ -22,12 +22,16 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mi.h" #include "regionstr.h" #include "globals.h" diff --git a/miext/shadow/shrotpack.h b/miext/shadow/shrotpack.h index a3ef338ee..062d8c394 100644 --- a/miext/shadow/shrotpack.h +++ b/miext/shadow/shrotpack.h @@ -27,12 +27,16 @@ * orientations work. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include "scrnintstr.h" #include "windowstr.h" -#include "font.h" +#include <X11/fonts/font.h> #include "dixfontstr.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "mi.h" #include "regionstr.h" #include "globals.h" diff --git a/os/WaitFor.c b/os/WaitFor.c index 18eacbdba..899ad42f7 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -56,6 +56,10 @@ SOFTWARE. * *****************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef WIN32 #include <X11/Xwinsock.h> #endif diff --git a/os/access.c b/os/access.c index baad02fda..4e5f75f3f 100644 --- a/os/access.c +++ b/os/access.c @@ -57,6 +57,10 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/os/access.c,v 3.53 2004/01/02 18:23:19 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef WIN32 #include <X11/Xwinsock.h> #endif @@ -33,6 +33,10 @@ from The Open Group. * Author: Keith Packard, MIT X Consortium */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef K5AUTH # include <krb5/krb5.h> #endif diff --git a/os/connection.c b/os/connection.c index 45063c8a6..fd4024577 100644 --- a/os/connection.c +++ b/os/connection.c @@ -63,11 +63,18 @@ SOFTWARE. * *****************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef WIN32 #include <X11/Xwinsock.h> #endif #include <X11/X.h> #include <X11/Xproto.h> +#define XSERV_t +#define TRANS_SERVER +#define TRANS_REOPEN #include <X11/Xtrans/Xtrans.h> #include <errno.h> #include <signal.h> @@ -55,6 +55,10 @@ SOFTWARE. *****************************************************************/ /* $XFree86: xc/programs/Xserver/os/io.c,v 3.34 2002/05/31 18:46:05 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #if 0 #define DEBUG_COMMUNICATION #endif diff --git a/os/k5auth.c b/os/k5auth.c index ebf16c9eb..b23a3d440 100644 --- a/os/k5auth.c +++ b/os/k5auth.c @@ -36,6 +36,10 @@ from The Open Group. * krb5 distribution. (At least the checking part) */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <sys/types.h> #include <sys/socket.h> #ifdef TCPCONN diff --git a/os/lbxio.c b/os/lbxio.c index 21724b58c..0a128df5b 100644 --- a/os/lbxio.c +++ b/os/lbxio.c @@ -49,6 +49,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: lbxio.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <X11/Xtrans/Xtrans.h> #include <X11/Xmd.h> @@ -78,6 +78,10 @@ OR PERFORMANCE OF THIS SOFTWARE. /* $XFree86: xc/programs/Xserver/os/log.c,v 1.6 2003/11/07 13:45:27 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/Xos.h> #include <stdio.h> #include <time.h> diff --git a/os/mitauth.c b/os/mitauth.c index dfaea35ab..9a806c02b 100644 --- a/os/mitauth.c +++ b/os/mitauth.c @@ -33,6 +33,10 @@ from The Open Group. * Author: Keith Packard, MIT X Consortium */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "osdep.h" diff --git a/os/oscolor.c b/os/oscolor.c index bb927c4b6..65de9e4f5 100644 --- a/os/oscolor.c +++ b/os/oscolor.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: oscolor.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef USE_RGB_TXT #ifdef NDBM diff --git a/os/osdep.h b/os/osdep.h index f1cc8b3a2..1ede06552 100644 --- a/os/osdep.h +++ b/os/osdep.h @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: osdep.h,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _OSDEP_H_ #define _OSDEP_H_ 1 diff --git a/os/osinit.c b/os/osinit.c index 03a017b85..b820c91be 100644 --- a/os/osinit.c +++ b/os/osinit.c @@ -47,6 +47,10 @@ SOFTWARE. ******************************************************************/ /* $Xorg: osinit.c,v 1.4 2001/02/09 02:05:23 xorgcvs Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <X11/X.h> #include <X11/os.h> diff --git a/os/rpcauth.c b/os/rpcauth.c index 037a4facf..71f87e9a4 100644 --- a/os/rpcauth.c +++ b/os/rpcauth.c @@ -34,6 +34,10 @@ from The Open Group. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef SECURE_RPC #include <X11/X.h> diff --git a/os/secauth.c b/os/secauth.c index 553f50a3a..ff057992f 100644 --- a/os/secauth.c +++ b/os/secauth.c @@ -26,6 +26,10 @@ from The Open Group. */ /* $XFree86: xc/programs/Xserver/os/secauth.c,v 1.10 2001/08/01 00:44:59 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/os.h> #include "osdep.h" diff --git a/os/strlcat.c b/os/strlcat.c index 7031de3a6..28e2338f9 100644 --- a/os/strlcat.c +++ b/os/strlcat.c @@ -18,6 +18,10 @@ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <sys/types.h> #include <string.h> diff --git a/os/strlcpy.c b/os/strlcpy.c index 71657da69..42442cc30 100644 --- a/os/strlcpy.c +++ b/os/strlcpy.c @@ -17,6 +17,10 @@ */ /* $XFree86$ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <sys/types.h> #include <string.h> diff --git a/os/utils.c b/os/utils.c index a94c29481..a3a0c99f6 100644 --- a/os/utils.c +++ b/os/utils.c @@ -52,6 +52,10 @@ OR PERFORMANCE OF THIS SOFTWARE. */ /* $XFree86: xc/programs/Xserver/os/utils.c,v 3.96 2004/01/07 04:16:37 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef __CYGWIN__ #include <stdlib.h> #include <signal.h> diff --git a/os/xalloc.c b/os/xalloc.c index f257cf41c..c266ca5ab 100644 --- a/os/xalloc.c +++ b/os/xalloc.c @@ -31,6 +31,10 @@ Pascal Haible. /* Only used if INTERNAL_MALLOC is defined * - otherwise xalloc() in utils.c is used */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef INTERNAL_MALLOC #include <stdlib.h> /* for malloc() etc. */ diff --git a/os/xdmauth.c b/os/xdmauth.c index 9c8bc2cdb..f54c83da8 100644 --- a/os/xdmauth.c +++ b/os/xdmauth.c @@ -35,6 +35,10 @@ from The Open Group. * Author: Keith Packard, MIT X Consortium */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <X11/X.h> #include <X11/Xtrans/Xtrans.h> diff --git a/os/xdmcp.c b/os/xdmcp.c index f90536b5f..44994380b 100644 --- a/os/xdmcp.c +++ b/os/xdmcp.c @@ -16,6 +16,10 @@ */ /* $XFree86: xc/programs/Xserver/os/xdmcp.c,v 3.31 2003/12/30 21:24:32 herrb Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef WIN32 #include <X11/Xwinsock.h> #endif diff --git a/os/xprintf.c b/os/xprintf.c index 70051f26f..bd8b1f339 100644 --- a/os/xprintf.c +++ b/os/xprintf.c @@ -26,6 +26,10 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/Xos.h> #include <X11/os.h> #include <stdarg.h> diff --git a/randr/mirandr.c b/randr/mirandr.c index ac29485bb..b1e19a746 100644 --- a/randr/mirandr.c +++ b/randr/mirandr.c @@ -25,6 +25,10 @@ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "scrnintstr.h" #include "mi.h" #include <X11/extensions/randr.h> diff --git a/randr/randr.c b/randr/randr.c index db9c57601..f63abcb20 100644 --- a/randr/randr.c +++ b/randr/randr.c @@ -27,6 +27,10 @@ #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/randr/randrstr.h b/randr/randrstr.h index eecadd7b5..cd4ce3846 100644 --- a/randr/randrstr.h +++ b/randr/randrstr.h @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _RANDRSTR_H_ #define _RANDRSTR_H_ diff --git a/record/record.c b/record/record.c index 55ae6934c..5809e0086 100644 --- a/record/record.c +++ b/record/record.c @@ -36,6 +36,10 @@ and Jim Haggerty of Metheus. /* $XFree86: xc/programs/Xserver/record/record.c,v 1.11 2003/11/03 05:12:01 tsi Exp $ */ #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "dixstruct.h" #include "extnsionst.h" #define _XRECORD_SERVER_ diff --git a/record/set.c b/record/set.c index a239e4af0..3b494e74b 100644 --- a/record/set.c +++ b/record/set.c @@ -51,6 +51,10 @@ from The Open Group. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef TESTING #include <X11/misc.h> #else diff --git a/render/animcur.c b/render/animcur.c index 1e857574e..e3915b2b8 100644 --- a/render/animcur.c +++ b/render/animcur.c @@ -32,6 +32,10 @@ * delta times between each image. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xmd.h> #include "servermd.h" diff --git a/render/filter.c b/render/filter.c index 5bd4efd56..d2e8bcc03 100644 --- a/render/filter.c +++ b/render/filter.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/render/glyph.c b/render/glyph.c index e224eab85..f3056711a 100644 --- a/render/glyph.c +++ b/render/glyph.c @@ -23,6 +23,10 @@ * Author: Keith Packard, SuSE, Inc. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/misc.h> #include "scrnintstr.h" #include <X11/os.h> diff --git a/render/glyphstr.h b/render/glyphstr.h index f4777a248..f582343d9 100644 --- a/render/glyphstr.h +++ b/render/glyphstr.h @@ -23,6 +23,10 @@ * Author: Keith Packard, SuSE, Inc. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _GLYPHSTR_H_ #define _GLYPHSTR_H_ diff --git a/render/miglyph.c b/render/miglyph.c index 72ff16bb2..237ec13a4 100644 --- a/render/miglyph.c +++ b/render/miglyph.c @@ -23,6 +23,10 @@ * Author: Keith Packard, SuSE, Inc. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "scrnintstr.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/render/miindex.c b/render/miindex.c index d6032cd46..03e2857a2 100644 --- a/render/miindex.c +++ b/render/miindex.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _MIINDEX_H_ #define _MIINDEX_H_ diff --git a/render/mipict.c b/render/mipict.c index a16e88cd9..81c775832 100644 --- a/render/mipict.c +++ b/render/mipict.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "scrnintstr.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/render/mipict.h b/render/mipict.h index e6e8b70fa..c15d1e1c5 100644 --- a/render/mipict.h +++ b/render/mipict.h @@ -23,6 +23,10 @@ * Author: Keith Packard, SuSE, Inc. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _MIPICT_H_ #define _MIPICT_H_ diff --git a/render/mirect.c b/render/mirect.c index d4b8522fa..096bb5cb2 100644 --- a/render/mirect.c +++ b/render/mirect.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "scrnintstr.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/render/mitrap.c b/render/mitrap.c index 12aa88f06..be1712420 100644 --- a/render/mitrap.c +++ b/render/mitrap.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "scrnintstr.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/render/mitri.c b/render/mitri.c index c81d53164..974225350 100644 --- a/render/mitri.c +++ b/render/mitri.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "scrnintstr.h" #include "gcstruct.h" #include "pixmapstr.h" diff --git a/render/picture.c b/render/picture.c index 48faa9b24..e83b1d07d 100644 --- a/render/picture.c +++ b/render/picture.c @@ -23,6 +23,10 @@ * Author: Keith Packard, SuSE, Inc. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/render/picture.h b/render/picture.h index b09d9aac2..e04790374 100644 --- a/render/picture.h +++ b/render/picture.h @@ -23,6 +23,10 @@ * Author: Keith Packard, SuSE, Inc. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _PICTURE_H_ #define _PICTURE_H_ diff --git a/render/picturestr.h b/render/picturestr.h index 58b840c6d..681bd9663 100644 --- a/render/picturestr.h +++ b/render/picturestr.h @@ -23,6 +23,10 @@ * Author: Keith Packard, SuSE, Inc. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _PICTURESTR_H_ #define _PICTURESTR_H_ diff --git a/render/render.c b/render/render.c index 6451ab803..8ef321980 100644 --- a/render/render.c +++ b/render/render.c @@ -26,6 +26,10 @@ #define NEED_REPLIES #define NEED_EVENTS +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <X11/misc.h> diff --git a/render/renderedge.c b/render/renderedge.c index b84eec14d..4534fe095 100644 --- a/render/renderedge.c +++ b/render/renderedge.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "renderedge.h" /* diff --git a/render/renderedge.h b/render/renderedge.h index d621d9dcf..20eeacc47 100644 --- a/render/renderedge.h +++ b/render/renderedge.h @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _RENDEREDGE_H_ #define _RENDEREDGE_H_ diff --git a/xfixes/cursor.c b/xfixes/cursor.c index 882022aad..25b0fac6e 100755 --- a/xfixes/cursor.c +++ b/xfixes/cursor.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/xfixes/region.c b/xfixes/region.c index b0073f5b3..1ee2cd744 100755 --- a/xfixes/region.c +++ b/xfixes/region.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/xfixes/saveset.c b/xfixes/saveset.c index 3c93726ec..780aeb57b 100755 --- a/xfixes/saveset.c +++ b/xfixes/saveset.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/xfixes/select.c b/xfixes/select.c index a40ef1773..71addd470 100755 --- a/xfixes/select.c +++ b/xfixes/select.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/xfixes/xfixes.c b/xfixes/xfixes.c index bf07f66f1..38e9b39c1 100755 --- a/xfixes/xfixes.c +++ b/xfixes/xfixes.c @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/xfixes/xfixes.h b/xfixes/xfixes.h index e1e3e0942..0f1e3b070 100755 --- a/xfixes/xfixes.h +++ b/xfixes/xfixes.h @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _XFIXES_H_ #define _XFIXES_H_ diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h index 05ab77d3f..079246797 100755 --- a/xfixes/xfixesint.h +++ b/xfixes/xfixesint.h @@ -22,6 +22,10 @@ * PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef _XFIXESINT_H_ #define _XFIXESINT_H_ diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c index cc85b8f9e..c415380ee 100644 --- a/xkb/XKBAlloc.c +++ b/xkb/XKBAlloc.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/lib/X11/XKBAlloc.c,v 3.5 2001/01/17 19:41:48 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef XKB_IN_SERVER #ifdef HAVE_CONFIG_H diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c index a1c0d1be8..d5b9a1c93 100644 --- a/xkb/XKBGAlloc.c +++ b/xkb/XKBGAlloc.c @@ -29,6 +29,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define NEED_EVENTS #define NEED_REPLIES +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef XKB_IN_SERVER #ifdef HAVE_CONFIG_H diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c index 9fe33e7de..db0020691 100644 --- a/xkb/XKBMAlloc.c +++ b/xkb/XKBMAlloc.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/lib/X11/XKBMAlloc.c,v 3.11 2001/01/17 19:41:48 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef XKB_IN_SERVER #ifdef HAVE_CONFIG_H diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c index 987c6e33a..6ad364127 100644 --- a/xkb/XKBMisc.c +++ b/xkb/XKBMisc.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/lib/X11/XKBMisc.c,v 3.5 2001/10/28 03:32:33 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef XKB_IN_SERVER #ifdef HAVE_CONFIG_H diff --git a/xkb/ddxBeep.c b/xkb/ddxBeep.c index 665f0e5a2..429d1e778 100644 --- a/xkb/ddxBeep.c +++ b/xkb/ddxBeep.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/xkb/ddxBeep.c,v 3.9 2002/12/05 21:59:00 paulo Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #define NEED_EVENTS 1 #include <X11/X.h> diff --git a/xkb/ddxConfig.c b/xkb/ddxConfig.c index c5e32d0b7..4f395d558 100644 --- a/xkb/ddxConfig.c +++ b/xkb/ddxConfig.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/xkb/ddxConfig.c,v 3.8 2002/12/20 20:18:35 paulo Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #define NEED_EVENTS 1 #include <X11/X.h> diff --git a/xkb/ddxCtrls.c b/xkb/ddxCtrls.c index 278cd1dc0..2e4e106ce 100644 --- a/xkb/ddxCtrls.c +++ b/xkb/ddxCtrls.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/xkb/ddxCtrls.c,v 1.3 2001/01/17 22:37:14 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #define NEED_EVENTS 1 #include <X11/X.h> diff --git a/xkb/ddxDevBtn.c b/xkb/ddxDevBtn.c index f93934a77..d0e37f263 100644 --- a/xkb/ddxDevBtn.c +++ b/xkb/ddxDevBtn.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/xkb/ddxDevBtn.c,v 3.3 2001/08/23 21:49:51 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #define NEED_EVENTS 1 #include <X11/X.h> diff --git a/xkb/ddxFakeBtn.c b/xkb/ddxFakeBtn.c index 540b72292..73c8a2415 100644 --- a/xkb/ddxFakeBtn.c +++ b/xkb/ddxFakeBtn.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #define NEED_EVENTS 1 #include <X11/X.h> diff --git a/xkb/ddxFakeMtn.c b/xkb/ddxFakeMtn.c index 93b58bd04..be5324d0f 100644 --- a/xkb/ddxFakeMtn.c +++ b/xkb/ddxFakeMtn.c @@ -27,6 +27,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/xkb/ddxFakeMtn.c,v 1.5 2003/09/13 16:39:01 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #define NEED_EVENTS 1 #include <X11/X.h> diff --git a/xkb/ddxInit.c b/xkb/ddxInit.c index 75567486d..8b76b7cb1 100644 --- a/xkb/ddxInit.c +++ b/xkb/ddxInit.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #define NEED_EVENTS 1 #include <X11/X.h> diff --git a/xkb/ddxKeyClick.c b/xkb/ddxKeyClick.c index 19a2ec9e1..c940e5321 100644 --- a/xkb/ddxKeyClick.c +++ b/xkb/ddxKeyClick.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #define NEED_EVENTS 1 #include <X11/X.h> diff --git a/xkb/ddxKillSrv.c b/xkb/ddxKillSrv.c index 7a822fa20..2e6ad6ee3 100644 --- a/xkb/ddxKillSrv.c +++ b/xkb/ddxKillSrv.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/xkb/ddxKillSrv.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #define NEED_EVENTS 1 #include <X11/X.h> diff --git a/xkb/ddxLEDs.c b/xkb/ddxLEDs.c index 5998f7614..fb5f72bf8 100644 --- a/xkb/ddxLEDs.c +++ b/xkb/ddxLEDs.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #define NEED_EVENTS 1 #include <X11/X.h> diff --git a/xkb/ddxList.c b/xkb/ddxList.c index 7e7c375ad..3cb4be09d 100644 --- a/xkb/ddxList.c +++ b/xkb/ddxList.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/xkb/ddxList.c,v 3.8 2003/07/16 01:39:05 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <ctype.h> #define NEED_EVENTS 1 diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index 5ad593f4c..5bad9cb31 100644 --- a/xkb/ddxLoad.c +++ b/xkb/ddxLoad.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/xkb/ddxLoad.c,v 3.35 2003/10/02 13:30:12 eich Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <ctype.h> #define NEED_EVENTS 1 diff --git a/xkb/ddxPrivate.c b/xkb/ddxPrivate.c index 3a9f8ea0b..b2b2dadc4 100644 --- a/xkb/ddxPrivate.c +++ b/xkb/ddxPrivate.c @@ -1,5 +1,9 @@ /* $XFree86: xc/programs/Xserver/xkb/ddxPrivate.c,v 1.2 2003/04/03 16:20:22 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #define NEED_EVENTS 1 #include <X11/X.h> diff --git a/xkb/ddxVT.c b/xkb/ddxVT.c index aa8cba00b..9e0ac9dd2 100644 --- a/xkb/ddxVT.c +++ b/xkb/ddxVT.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/xkb/ddxVT.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #define NEED_EVENTS 1 #include <X11/X.h> diff --git a/xkb/maprules.c b/xkb/maprules.c index e7e369d2e..03ca51eaa 100644 --- a/xkb/maprules.c +++ b/xkb/maprules.c @@ -26,6 +26,10 @@ ********************************************************/ /* $XFree86: xc/lib/xkbfile/maprules.c,v 3.17 2002/11/26 01:43:25 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/xkb/xkb.c,v 3.22tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <X11/X.h> #define NEED_EVENTS @@ -36,7 +40,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define XKBSRV_NEED_FILE_FUNCS #include <X11/extensions/XKBsrv.h> #include "extnsionst.h" -#include "modinit.h" #include "xkb.h" #include <X11/extensions/XI.h> diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c index 6e519dc5a..b31ca7ed5 100644 --- a/xkb/xkbAccessX.c +++ b/xkb/xkbAccessX.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/xkb/xkbAccessX.c,v 1.9 2001/08/23 14:33:25 alanh Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <math.h> #ifdef __QNX__ diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index 9198825df..2f229686e 100644 --- a/xkb/xkbActions.c +++ b/xkb/xkbActions.c @@ -27,6 +27,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/xkb/xkbActions.c,v 3.13 2003/07/16 01:39:08 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <math.h> #define NEED_EVENTS 1 diff --git a/xkb/xkbDflts.h b/xkb/xkbDflts.h index 7ea30bde2..e3dd9cdda 100644 --- a/xkb/xkbDflts.h +++ b/xkb/xkbDflts.h @@ -2,6 +2,10 @@ /* $XFree86: xc/programs/Xserver/xkb/xkbDflts.h,v 1.2 2001/10/28 03:34:20 tsi Exp $ */ /* This file generated automatically by xkbcomp */ /* DO NOT EDIT */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef DEFAULT_H #define DEFAULT_H 1 diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c index 29ce818c1..8305208a0 100644 --- a/xkb/xkbEvents.c +++ b/xkb/xkbEvents.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/xkb/xkbEvents.c,v 3.11 2003/07/16 01:39:10 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #define NEED_EVENTS 1 #include <X11/X.h> diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c index 35f9415d1..3ff14cca5 100644 --- a/xkb/xkbInit.c +++ b/xkb/xkbInit.c @@ -27,6 +27,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/xkb/xkbInit.c,v 3.32tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <stdlib.h> #include <ctype.h> diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c index 212048ac8..0b4fcaeab 100644 --- a/xkb/xkbLEDs.c +++ b/xkb/xkbLEDs.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/xkb/xkbLEDs.c,v 3.7 2003/07/16 01:39:10 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <ctype.h> #include <math.h> diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c index 71cc3e403..ec850d89c 100644 --- a/xkb/xkbPrKeyEv.c +++ b/xkb/xkbPrKeyEv.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/xkb/xkbPrKeyEv.c,v 3.8 2001/01/17 22:37:15 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <math.h> #define NEED_EVENTS 1 diff --git a/xkb/xkbPrOtherEv.c b/xkb/xkbPrOtherEv.c index 1e2773f64..f69ff00d6 100644 --- a/xkb/xkbPrOtherEv.c +++ b/xkb/xkbPrOtherEv.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86$ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <math.h> #define NEED_EVENTS 1 diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c index 635329445..193a4f463 100644 --- a/xkb/xkbSwap.c +++ b/xkb/xkbSwap.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/xkb/xkbSwap.c,v 3.4 2003/09/13 16:39:01 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include "stdio.h" #include <X11/X.h> #define NEED_EVENTS diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index c4ff1ca3f..d655efc75 100644 --- a/xkb/xkbUtils.c +++ b/xkb/xkbUtils.c @@ -26,6 +26,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ /* $XFree86: xc/programs/Xserver/xkb/xkbUtils.c,v 3.16 2003/11/03 05:12:02 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #include <stdio.h> #include <ctype.h> #include <math.h> diff --git a/xkb/xkbconfig.c b/xkb/xkbconfig.c index 3c01fa8b2..3d582d1fb 100644 --- a/xkb/xkbconfig.c +++ b/xkb/xkbconfig.c @@ -26,6 +26,10 @@ ********************************************************/ /* $XFree86: xc/lib/xkbfile/xkbconfig.c,v 3.7 2001/11/30 12:11:51 eich Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/xkb/xkberrs.c b/xkb/xkberrs.c index 08b44f2a3..731d0b5cf 100644 --- a/xkb/xkberrs.c +++ b/xkb/xkberrs.c @@ -26,6 +26,10 @@ ********************************************************/ /* $XFree86: xc/lib/xkbfile/xkberrs.c,v 3.4 2001/07/29 05:01:13 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c index c1d136820..f55ab5bdf 100644 --- a/xkb/xkbfmisc.c +++ b/xkb/xkbfmisc.c @@ -26,6 +26,10 @@ ********************************************************/ /* $XFree86: xc/lib/xkbfile/xkbmisc.c,v 1.7 2003/07/16 02:31:10 dawes Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/xkb/xkbout.c b/xkb/xkbout.c index 059959a3e..cdf699509 100644 --- a/xkb/xkbout.c +++ b/xkb/xkbout.c @@ -26,6 +26,10 @@ ********************************************************/ /* $XFree86: xc/lib/xkbfile/xkbout.c,v 3.9 2001/10/28 03:32:47 tsi Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c index 86df1cb82..0df7c894b 100644 --- a/xkb/xkbtext.c +++ b/xkb/xkbtext.c @@ -26,6 +26,10 @@ ********************************************************/ /* $XFree86: xc/lib/xkbfile/xkbtext.c,v 3.11 2002/12/21 18:49:02 paulo Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/xkb/xkmread.c b/xkb/xkmread.c index a69058a5c..3f38a4f96 100644 --- a/xkb/xkmread.c +++ b/xkb/xkmread.c @@ -26,6 +26,10 @@ ********************************************************/ /* $XFree86: xc/lib/xkbfile/xkmread.c,v 1.6 2002/02/13 22:09:42 herrb Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifdef HAVE_CONFIG_H #include <config.h> #endif |