summaryrefslogtreecommitdiff
path: root/afb
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2005-07-03 07:02:09 +0000
committerDaniel Stone <daniel@fooishbar.org>2005-07-03 07:02:09 +0000
commite03198972ca78b03ad13cb49112c03a052bb763b (patch)
tree1278f4b1a41b11511b0f5c2932191e44f0f9d8d3 /afb
parentb8aef6c474ffc6d637bec178674898ea95ccde47 (diff)
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings. Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all source files in the xserver/xorg tree, predicated on defines of HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to <X11/fonts/foo.h>.
Diffstat (limited to 'afb')
-rw-r--r--afb/afb.h4
-rw-r--r--afb/afbbitblt.c4
-rw-r--r--afb/afbblt.c4
-rw-r--r--afb/afbbres.c4
-rw-r--r--afb/afbbresd.c4
-rw-r--r--afb/afbbstore.c4
-rw-r--r--afb/afbclip.c4
-rw-r--r--afb/afbcmap.c4
-rw-r--r--afb/afbfillarc.c4
-rw-r--r--afb/afbfillrct.c4
-rw-r--r--afb/afbfillsp.c4
-rw-r--r--afb/afbfont.c6
-rw-r--r--afb/afbgc.c6
-rw-r--r--afb/afbgetsp.c4
-rw-r--r--afb/afbhrzvert.c4
-rw-r--r--afb/afbimage.c4
-rw-r--r--afb/afbimggblt.c6
-rw-r--r--afb/afbline.c4
-rw-r--r--afb/afbmisc.c4
-rw-r--r--afb/afbpixmap.c4
-rw-r--r--afb/afbply1rct.c4
-rw-r--r--afb/afbplygblt.c6
-rw-r--r--afb/afbpntarea.c4
-rw-r--r--afb/afbpntwin.c4
-rw-r--r--afb/afbpolypnt.c4
-rw-r--r--afb/afbpushpxl.c4
-rw-r--r--afb/afbscrinit.c4
-rw-r--r--afb/afbsetsp.c4
-rw-r--r--afb/afbtegblt.c6
-rw-r--r--afb/afbtile.c4
-rw-r--r--afb/afbwindow.c4
-rw-r--r--afb/afbzerarc.c4
32 files changed, 133 insertions, 5 deletions
diff --git a/afb/afb.h b/afb/afb.h
index 708fe7643..c1486dc2c 100644
--- a/afb/afb.h
+++ b/afb/afb.h
@@ -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"
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 14:37:09 +0000