diff options
author | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:01:01 +0000 |
---|---|---|
committer | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:01:01 +0000 |
commit | 932edb23b47440397447265bf72ad7932fd80070 (patch) | |
tree | 16cda22a6b6b9e9a8ca05a9946dc66f4edf34293 /src/Speedo | |
parent | b03d67fd1612a0df5132b10dd0bd9b2cec053a39 (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 'src/Speedo')
-rw-r--r-- | src/Speedo/spfile.c | 4 | ||||
-rw-r--r-- | src/Speedo/spfont.c | 2 | ||||
-rw-r--r-- | src/Speedo/spfuncs.c | 4 | ||||
-rw-r--r-- | src/Speedo/spglyph.c | 2 | ||||
-rw-r--r-- | src/Speedo/spinfo.c | 4 | ||||
-rw-r--r-- | src/Speedo/spint.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/src/Speedo/spfile.c b/src/Speedo/spfile.c index ef2a764..c3bd9b4 100644 --- a/src/Speedo/spfile.c +++ b/src/Speedo/spfile.c @@ -51,8 +51,8 @@ from The Open Group. */ /* $XFree86: xc/lib/font/Speedo/spfile.c,v 1.13 2001/08/13 21:46:47 dawes Exp $ */ -#include "fntfilst.h" -#include "fontenc.h" +#include <X11/fonts/fntfilst.h> +#include <X11/fonts/fontenc.h> #ifndef FONTMODULE #include <stdio.h> #else diff --git a/src/Speedo/spfont.c b/src/Speedo/spfont.c index 684caaf..14d47b7 100644 --- a/src/Speedo/spfont.c +++ b/src/Speedo/spfont.c @@ -57,7 +57,7 @@ from The Open Group. #include <X11/fonts/FSproto.h> #include "spint.h" -#include "fontutil.h" +#include <X11/fonts/fontutil.h> #ifndef FONTMODULE #ifdef _XOPEN_SOURCE #include <math.h> diff --git a/src/Speedo/spfuncs.c b/src/Speedo/spfuncs.c index 75f779b..840f0e1 100644 --- a/src/Speedo/spfuncs.c +++ b/src/Speedo/spfuncs.c @@ -54,8 +54,8 @@ from The Open Group. #ifndef FONTMODULE #include <X11/Xos.h> #endif -#include "fntfilst.h" -#include "fontutil.h" +#include <X11/fonts/fntfilst.h> +#include <X11/fonts/fontutil.h> #include "spint.h" /* ARGSUSED */ diff --git a/src/Speedo/spglyph.c b/src/Speedo/spglyph.c index 979a472..dbf47b9 100644 --- a/src/Speedo/spglyph.c +++ b/src/Speedo/spglyph.c @@ -53,7 +53,7 @@ from The Open Group. #include <X11/X.h> /* for bit order #defines */ #include "spint.h" -#include "fontutil.h" +#include <X11/fonts/fontutil.h> #undef CLIP_BBOX_NOISE diff --git a/src/Speedo/spinfo.c b/src/Speedo/spinfo.c index d7c9c0e..054b46e 100644 --- a/src/Speedo/spinfo.c +++ b/src/Speedo/spinfo.c @@ -51,8 +51,8 @@ from The Open Group. */ /* $XFree86: xc/lib/font/Speedo/spinfo.c,v 1.12 2001/12/14 19:56:42 dawes Exp $ */ -#include "fntfilst.h" -#include "fontutil.h" +#include <X11/fonts/fntfilst.h> +#include <X11/fonts/fontutil.h> #include "spint.h" #ifndef FONTMODULE #include <math.h> diff --git a/src/Speedo/spint.h b/src/Speedo/spint.h index 18e5203..118ea8f 100644 --- a/src/Speedo/spint.h +++ b/src/Speedo/spint.h @@ -52,7 +52,7 @@ from The Open Group. #ifndef _SPINT_H_ #define _SPINT_H_ -#include "fntfilst.h" +#include <X11/fonts/fntfilst.h> #ifndef XFree86LOADER #include <stdio.h> #else |