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-24 20:55:49 +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/cfb/cfb.h
+++ b/cfb/cfb.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>
--- 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_

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

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

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

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