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/fc | |
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/fc')
-rw-r--r-- | src/fc/fsconvert.c | 4 | ||||
-rw-r--r-- | src/fc/fserve.c | 4 | ||||
-rw-r--r-- | src/fc/fsio.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/fc/fsconvert.c b/src/fc/fsconvert.c index 3920325..ea2b45b 100644 --- a/src/fc/fsconvert.c +++ b/src/fc/fsconvert.c @@ -32,10 +32,10 @@ #include <X11/Xpoll.h> #include <X11/fonts/FS.h> #include <X11/fonts/FSproto.h> -#include "fontmisc.h" +#include <X11/fonts/fontmisc.h> #include <X11/fonts/fontstruct.h> #include "fservestr.h" -#include "fontutil.h" +#include <X11/fonts/fontutil.h> #include "fslibos.h" extern char _fs_glyph_undefined; diff --git a/src/fc/fserve.c b/src/fc/fserve.c index ec66266..96698a0 100644 --- a/src/fc/fserve.c +++ b/src/fc/fserve.c @@ -64,10 +64,10 @@ in this Software without prior written authorization from The Open Group. #include <X11/fonts/FSproto.h> #include <X11/X.h> #include <X11/Xos.h> -#include "fontmisc.h" +#include <X11/fonts/fontmisc.h> #include <X11/fonts/fontstruct.h> #include "fservestr.h" -#include "fontutil.h" +#include <X11/fonts/fontutil.h> #include <errno.h> #include <time.h> diff --git a/src/fc/fsio.c b/src/fc/fsio.c index 9d5d7b4..f788f9c 100644 --- a/src/fc/fsio.c +++ b/src/fc/fsio.c @@ -39,7 +39,7 @@ #include "X11/Xpoll.h" #include <X11/fonts/FS.h> #include <X11/fonts/FSproto.h> -#include "fontmisc.h" +#include <X11/fonts/fontmisc.h> #include <X11/fonts/fontstruct.h> #include "fservestr.h" |