summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/fontfile/ffcheck.c10
2 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index c014a70..14cb05c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-31 Daniel Stone <daniel@freedesktop.org>
+
+ * src/fontfile/ffcheck.c:
+ Change BUILD_* to XFONT_*. (Drew Parsons)
+ Minor cleanup: remove random #ifndef CRAY.
+
2006-03-20 Adam Jackson <ajax@freedesktop.org>
* src/Makefile.am:
diff --git a/src/fontfile/ffcheck.c b/src/fontfile/ffcheck.c
index 9a70a17..fed6189 100644
--- a/src/fontfile/ffcheck.c
+++ b/src/fontfile/ffcheck.c
@@ -125,18 +125,16 @@ FontFileCheckRegisterFpeFunctions (void)
BitmapRegisterFontFileFunctions ();
-#ifndef CRAY
-#ifdef BUILD_SPEEDO
+#ifdef XFONT_SPEEDO
SpeedoRegisterFontFileFunctions ();
#endif
-#ifdef BUILD_TYPE1
+#ifdef XFONT_TYPE1
Type1RegisterFontFileFunctions();
#endif
-#endif
-#ifdef BUILD_CID
+#ifdef XFONT_CID
CIDRegisterFontFileFunctions();
#endif
-#ifdef BUILD_FREETYPE
+#ifdef XFONT_FREETYPE
FreeTypeRegisterFontFileFunctions();
#endif