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>.
2026-09-16 19:32:26 +00:00 · 2005-07-03 07:02:09 +00:00 · 2005-07-03 07:02:09 +00:00 · e03198972c
commit e03198972c
parent b8aef6c474
1248 changed files with 5220 additions and 183 deletions
--- 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"
--- 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"

 /*
--- 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"

--- 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"
--- 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"
--- 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_

--- 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_

--- 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_

--- 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 = {
--- 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;
--- 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
--- 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"
--- 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
--- 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"

--- 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"

 /*
--- 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"
--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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

--- 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;
--- 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

--- 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

--- 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"
--- 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"
--- 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"
--- 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"

--- 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

--- 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"
--- 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_

--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"