summaryrefslogtreecommitdiff
path: root/mi/mi.h
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/mi.h
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/mi.h')
-rw-r--r--mi/mi.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/mi/mi.h b/mi/mi.h
index 5d284cab1..ad682a915 100644
--- a/mi/mi.h
+++ b/mi/mi.h
@@ -47,6 +47,10 @@ SOFTWARE.
******************************************************************/
/* $XFree86: xc/programs/Xserver/mi/mi.h,v 3.9 2001/08/06 20:51:16 dawes Exp $ */
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
#ifndef MI_H
#define MI_H
#include <X11/X.h>
@@ -54,7 +58,7 @@ SOFTWARE.
#include "validate.h"
#include "window.h"
#include "gc.h"
-#include "font.h"
+#include <X11/fonts/font.h>
#include "input.h"
#include "cursor.h"