From 4511576ba77ede8b38b5166e934c1edbdb446a21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Suzuki=2C=20Toshiya=20=28=E9=88=B4=E6=9C=A8=E4=BF=8A?= =?UTF-8?q?=E5=93=89=29?= Date: Fri, 28 Oct 2005 15:39:58 +0000 Subject: [PATCH] fix invalid cast from NULL to integer typed variables --- ChangeLog | 6 ++++++ src/base/ftmac.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c226c295..72380f6e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-10-28 suzuki toshiya + + * 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 * include/freetype/ftsysmem.h, include/freetype/ftsysio.h: Removed. diff --git a/src/base/ftmac.c b/src/base/ftmac.c index 0c45372c6..f3ae209fb 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;