kc3-lang/freetype

diff --git a/ChangeLog b/ChangeLog
index 3c226c2..72380f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-28  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	* src/base/ftmac.c: fix invalid casts from NULL to integer typed
+	variables. Advised by David Turner, Masatake YAMATO, Sean McBride
+	and George Williams.
+
 2005-10-27  Werner Lemberg  <wl@gnu.org>
 
 	* include/freetype/ftsysmem.h, include/freetype/ftsysio.h: Removed.
diff --git a/src/base/ftmac.c b/src/base/ftmac.c
index 0c45372..f3ae209 100644
--- a/src/base/ftmac.c
+++ b/src/base/ftmac.c
@@ -838,8 +838,8 @@
     OSStatus              status = FMCreateFontFamilyIterator( NULL, NULL,
                                                                options,
                                                                &famIter );
-    FMFont                the_font = NULL;
-    FMFontFamily          family   = NULL;
+    FMFont                the_font = 0;
+    FMFontFamily          family   = 0;
 
 
     *face_index = 0;