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/dixfontstr.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/dixfontstr.h')
| -rw-r--r-- | include/dixfontstr.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/dixfontstr.h b/include/dixfontstr.h index 757b8bbc4..ba696c56f 100644 --- a/include/dixfontstr.h +++ b/include/dixfontstr.h @@ -22,12 +22,16 @@ SOFTWARE. ******************************************************************/ +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + #ifndef DIXFONTSTRUCT_H #define DIXFONTSTRUCT_H #include "servermd.h" #include "dixfont.h" -#include "fontstruct.h" +#include <X11/fonts/fontstruct.h> #include "closure.h" #define NEED_REPLIES #include <X11/Xproto.h> /* for xQueryFontReply */ |