summaryrefslogtreecommitdiff
path: root/mi/misprite.c
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2005-07-03 07:02:09 +0000
committerDaniel Stone <daniel@fooishbar.org>2005-07-03 07:02:09 +0000
commite03198972ca78b03ad13cb49112c03a052bb763b (patch)
tree1278f4b1a41b11511b0f5c2932191e44f0f9d8d3 /mi/misprite.c
parentb8aef6c474ffc6d637bec178674898ea95ccde47 (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 'mi/misprite.c')
-rw-r--r--mi/misprite.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/mi/misprite.c b/mi/misprite.c
index 64fd04eb5..6c1ed1bb3 100644
--- a/mi/misprite.c
+++ b/mi/misprite.c
@@ -39,7 +39,7 @@ in this Software without prior written authorization from The Open Group.
# include "input.h"
# include "mi.h"
# include "cursorstr.h"
-# include "font.h"
+# include <X11/fonts/font.h>
# include "scrnintstr.h"
# include "colormapst.h"
# include "windowstr.h"
@@ -47,7 +47,11 @@ in this Software without prior written authorization from The Open Group.
# include "mipointer.h"
# include "mispritest.h"
# include "dixfontstr.h"
-# include "fontstruct.h"
+# include <X11/fonts/fontstruct.h>
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#ifdef RENDER
# include "mipict.h"
#endif