From e03198972ca78b03ad13cb49112c03a052bb763b Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Sun, 3 Jul 2005 07:02:09 +0000
Subject: 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>.

---
 hw/xfree86/xf8_32bpp/cfbgcmisc.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'hw/xfree86/xf8_32bpp/cfbgcmisc.c')

diff --git a/hw/xfree86/xf8_32bpp/cfbgcmisc.c b/hw/xfree86/xf8_32bpp/cfbgcmisc.c
index 9a3bfc5ef..356b6cc9f 100644
--- a/hw/xfree86/xf8_32bpp/cfbgcmisc.c
+++ b/hw/xfree86/xf8_32bpp/cfbgcmisc.c
@@ -1,5 +1,9 @@
 /* $XFree86$ */
 
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include <X11/Xproto.h>
@@ -8,7 +12,7 @@
 #undef PSZ
 #include "cfb32.h"
 #include "cfb8_32.h"
-#include "fontstruct.h"
+#include <X11/fonts/fontstruct.h>
 #include "dixfontstr.h"
 #include "gcstruct.h"
 #include "windowstr.h"
-- 
cgit v1.2.3