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 /ilbm | |
| parent | b8aef6c474ffc6d637bec178674898ea95ccde47 (diff) | |
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
source files in the xserver/xorg tree, predicated on defines of
HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
<X11/fonts/foo.h>.
Diffstat (limited to 'ilbm')
| -rw-r--r-- | ilbm/ilbm.h | 4 | ||||
| -rw-r--r-- | ilbm/ilbmbitblt.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmblt.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmbres.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmbresd.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmbstore.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmclip.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmcmap.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmfillarc.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmfillrct.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmfillsp.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmfont.c | 6 | ||||
| -rw-r--r-- | ilbm/ilbmgc.c | 6 | ||||
| -rw-r--r-- | ilbm/ilbmgetsp.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmhrzvert.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmimage.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmimggblt.c | 6 | ||||
| -rw-r--r-- | ilbm/ilbmline.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmmisc.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmpixmap.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmply1rct.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmplygblt.c | 6 | ||||
| -rw-r--r-- | ilbm/ilbmpntarea.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmpntwin.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmpolypnt.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmpushpxl.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmscrinit.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmsetsp.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmtegblt.c | 6 | ||||
| -rw-r--r-- | ilbm/ilbmtile.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmwindow.c | 4 | ||||
| -rw-r--r-- | ilbm/ilbmzerarc.c | 4 |
32 files changed, 133 insertions, 5 deletions
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" |