summaryrefslogtreecommitdiff
path: root/hw/xnest/Font.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 /hw/xnest/Font.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 'hw/xnest/Font.c')
-rw-r--r--hw/xnest/Font.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c
index f78234ea0..d5ce79f85 100644
--- a/hw/xnest/Font.c
+++ b/hw/xnest/Font.c
@@ -19,8 +19,8 @@ is" without express or implied warranty.
#include <X11/Xproto.h>
#include <X11/misc.h>
#include "regionstr.h"
-#include "font.h"
-#include "fontstruct.h"
+#include <X11/fonts/font.h>
+#include <X11/fonts/fontstruct.h>
#include "scrnintstr.h"
#include "Xnest.h"