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 /include/dixfont.h | |
| 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 'include/dixfont.h')
| -rw-r--r-- | include/dixfont.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/dixfont.h b/include/dixfont.h index d3bb69b0a..1d249b302 100644 --- a/include/dixfont.h +++ b/include/dixfont.h @@ -23,13 +23,17 @@ SOFTWARE. ******************************************************************/ /* $XFree86: xc/programs/Xserver/include/dixfont.h,v 3.7 2001/02/02 21:39:02 herrb Exp $ */ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef DIXFONT_H #define DIXFONT_H 1 #include "dix.h" -#include "font.h" +#include <X11/fonts/font.h> #include "closure.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #define NullDIXFontProp ((DIXFontPropPtr)0) |