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/builtins | |
| parent | b03d67fd1612a0df5132b10dd0bd9b2cec053a39 (diff) | |
| download | xorg-lib-libXfont-932edb23b47440397447265bf72ad7932fd80070.tar.gz | |
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/builtins')
| -rw-r--r-- | src/builtins/builtin.h | 8 | ||||
| -rw-r--r-- | src/builtins/fpe.c | 2 | ||||
| -rw-r--r-- | src/builtins/render.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/builtins/builtin.h b/src/builtins/builtin.h index 5ee94a6..ea98407 100644 --- a/src/builtins/builtin.h +++ b/src/builtins/builtin.h @@ -26,10 +26,10 @@ #include <X11/Xdefs.h> #include <X11/fonts/font.h> -#include "fontxlfd.h" -#include "fntfil.h" -#include "fntfilio.h" -#include "fntfilst.h" +#include <X11/fonts/fontxlfd.h> +#include <X11/fonts/fntfil.h> +#include <X11/fonts/fntfilio.h> +#include <X11/fonts/fntfilst.h> typedef struct _BuiltinFile { const char *name; diff --git a/src/builtins/fpe.c b/src/builtins/fpe.c index 219d998..b5c67ce 100644 --- a/src/builtins/fpe.c +++ b/src/builtins/fpe.c @@ -24,7 +24,7 @@ */ /* $XFree86: xc/lib/font/builtins/fpe.c,v 1.3 1999/12/30 02:29:51 robin Exp $ */ -#include "fntfilst.h" +#include <X11/fonts/fntfilst.h> static int font_file_type; diff --git a/src/builtins/render.c b/src/builtins/render.c index 7e7180e..8f8536a 100644 --- a/src/builtins/render.c +++ b/src/builtins/render.c @@ -24,7 +24,7 @@ */ /* $XFree86: xc/lib/font/builtins/render.c,v 1.3 1999/12/30 02:29:51 robin Exp $ */ -#include "fntfilst.h" +#include <X11/fonts/fntfilst.h> #include "builtin.h" BuiltinOpenBitmap (fpe, ppFont, flags, entry, fileName, format, fmask) |