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/ilbmfont.c | |
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/ilbmfont.c')
-rw-r--r-- | ilbm/ilbmfont.c | 6 |
1 files changed, 5 insertions, 1 deletions
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" |