commit 4511576ba77ede8b38b5166e934c1edbdb446a21
author Suzuki, Toshiya (鈴木俊哉) <mpsuzuki@hiroshima-u.ac.jp> Fri Oct 28 15:39:58 2005 +0000
committer Suzuki, Toshiya (鈴木俊哉) <mpsuzuki@hiroshima-u.ac.jp> Fri Oct 28 15:39:58 2005 +0000
tree e0bcff904946b60d8183c9ef832bf4b83e71d3ff
parent 4b5661c3868134f4fa7c5e2c840e55beed2d26bd

fix invalid cast from NULL to integer typed variables

ChangeLog

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.

src/base/ftmac.c

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;