xserver/include dixfont.h,3.10,3.11 dixfontstr.h,1.1.1.2,1.2

Committed by: keithp

Update of /cvs/xserver/xserver/include
In directory gabe:/tmp/cvs-serv25750/include

Modified Files:
	dixfont.h dixfontstr.h 
Log Message:
2005-08-07  Keith Packard  <[email protected]>

	* configure.ac:
	* dix/dispatch.c:
	* dix/events.c:
	* dix/glyphcurs.c:
	* dix/main.c:
	* dix/swaprep.c:
	* dix/xpstubs.c:
	* fb/fbglyph.c:
	* hw/kdrive/chips/chipsdraw.c:
	* hw/kdrive/ephyr/hostx.c: (hostx_screen_init):
	* hw/kdrive/epson/epson13806draw.c:
	* hw/kdrive/i810/i810draw.c:
	* hw/kdrive/mach64/mach64draw.c:
	* hw/kdrive/nvidia/nvidiadraw.c:
	* hw/kdrive/smi/smidraw.c:
	* hw/kdrive/src/kaa.c:
	* hw/kdrive/src/kinput.c: (KdMouseAccelerate):
	* include/dixfont.h:
	* include/dixfontstr.h:
	* mi/mi.h:
	* mi/mibstore.c:
	* mi/miglblt.c:
	* mi/mipolytext.c:
	* mi/misprite.c:
	* mi/miwideline.c:
	* miext/damage/damage.c:
	* miext/shadow/shadow.c:
	* miext/shadow/shalloc.c:
	* miext/shadow/shpacked.c:
	* miext/shadow/shplanar.c:
	* miext/shadow/shplanar8.c:
	* miext/shadow/shrotate.c:
	* miext/shadow/shrotpack.h:
	* miext/shadow/shrotpackYX.h:
	* os/xstrans.c:
	* os/xstrans.h:
	Build with modular X.org libraries and headers.

	* composite/compwindow.c
	Don't damage unmoved windows.
	Let border clip reset leave damage alone,
	pending actual damage for painting.


Index: dixfont.h
===================================================================
RCS file: /cvs/xserver/xserver/include/dixfont.h,v
retrieving revision 3.10
retrieving revision 3.11
diff -u -d -r3.10 -r3.11
--- dixfont.h	1 Oct 2003 06:43:50 -0000	3.10
+++ dixfont.h	8 Aug 2005 06:25:21 -0000	3.11
@@ -27,10 +27,10 @@
 #define DIXFONT_H 1
 
 #include "dix.h"
-#include "font.h"
-#include "fontconf.h"
+#include <X11/fonts/font.h>
+#include <X11/fonts/fontconf.h>
 #include "closure.h"
-#include "fontstruct.h"
+#include <X11/fonts/fontstruct.h>
 
 #define NullDIXFontProp ((DIXFontPropPtr)0)
 

Index: dixfontstr.h
===================================================================
RCS file: /cvs/xserver/xserver/include/dixfontstr.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- dixfontstr.h	16 Jan 2001 22:43:59 -0000	1.1.1.2
+++ dixfontstr.h	8 Aug 2005 06:25:21 -0000	1.2
@@ -27,7 +27,6 @@
 
 #include "servermd.h"
 #include "dixfont.h"
-#include "fontstruct.h"
 #include "closure.h"
 #define NEED_REPLIES
 #include "X11/Xproto.h" /* for xQueryFontReply */