[xlibs-commit] Xft .cvsignore,1.3,1.4 ChangeLog,1.6,1.7 Xft.h,1.35,1.36

[Noah Levitt]

Committed by: nlevitt

Update of /cvs/xlibs/Xft
In directory pdx:/tmp/cvs-serv16870

Modified Files:
	.cvsignore ChangeLog Xft.h 
Log Message:
2003-11-18  Noah Levitt  <nlevitt@columbia.edu>

	* .cvsignore: ignore *.loT

	* Xft.h: Fix build with freetype 2.1.7. (bug #149, Eric
	Christopherson)



Index: .cvsignore
===================================================================
RCS file: /cvs/xlibs/Xft/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- .cvsignore	11 Nov 2003 18:34:49 -0000	1.3
+++ .cvsignore	18 Nov 2003 07:26:25 -0000	1.4
@@ -1,4 +1,5 @@
 *.lo
+*.loT
 xft.pc
 xft-config
 xft-*.*.tar.gz

Index: ChangeLog
===================================================================
RCS file: /cvs/xlibs/Xft/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ChangeLog	23 Sep 2003 20:27:37 -0000	1.6
+++ ChangeLog	18 Nov 2003 07:26:25 -0000	1.7
@@ -1,3 +1,10 @@
+2003-11-18  Noah Levitt  <nlevitt@columbia.edu>
+
+	* .cvsignore: ignore *.loT
+
+	* Xft.h: Fix build with freetype 2.1.7. (bug #149, Eric
+	Christopherson)
+
 2003-09-23  Owen Taylor  <otaylor@redhat.com>
 
         Support FC_HINT_STYLE (#Bug 118)

Index: Xft.h
===================================================================
RCS file: /cvs/xlibs/Xft/Xft.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- Xft.h	6 May 2003 05:37:49 -0000	1.35
+++ Xft.h	18 Nov 2003 07:26:25 -0000	1.36
@@ -38,7 +38,8 @@
 #define XftVersion	XFT_VERSION
 
 #include <stdarg.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
 #include <fontconfig/fontconfig.h>
 #include <X11/extensions/Xrender.h>