From ad260f633f6df4e1e05f11b1099028947a049d01 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Thu, 5 Apr 2007 09:32:58 +0000 Subject: [PATCH] fix build without FreeType --- ext/gd/gd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/gd/gd.c b/ext/gd/gd.c index b0611956b2..5249e7541e 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -1084,7 +1084,7 @@ zend_module_entry gd_module_entry = { NULL, #endif NULL, -#if HAVE_GD_STRINGFT && (HAVE_GD_FONTCACHESHUTDOWN || HAVE_GD_FREEFONTCACHE) +#if HAVE_GD_STRINGFT && (HAVE_LIBFREETYPE && (HAVE_GD_FONTCACHESHUTDOWN || HAVE_GD_FREEFONTCACHE)) PHP_RSHUTDOWN(gd), #else NULL, @@ -1134,7 +1134,7 @@ PHP_MSHUTDOWN_FUNCTION(gd) #if HAVE_LIBT1 T1_CloseLib(); #endif -#if HAVE_GD_FONTMUTEX +#if HAVE_GD_FONTMUTEX && HAVE_LIBFREETYPE gdFontCacheMutexShutdown(); #endif return SUCCESS; @@ -1149,7 +1149,7 @@ PHP_MINIT_FUNCTION(gd) { le_gd = zend_register_list_destructors_ex(php_free_gd_image, NULL, "gd", module_number); le_gd_font = zend_register_list_destructors_ex(php_free_gd_font, NULL, "gd font", module_number); -#if HAVE_GD_FONTMUTEX +#if HAVE_GD_FONTMUTEX && HAVE_LIBFREETYPE gdFontCacheMutexSetup(); #endif #if HAVE_LIBT1 @@ -1234,7 +1234,7 @@ PHP_MINIT_FUNCTION(gd) /* {{{ PHP_RSHUTDOWN_FUNCTION */ -#if HAVE_GD_STRINGFT && (HAVE_GD_FONTCACHESHUTDOWN || HAVE_GD_FREEFONTCACHE) +#if HAVE_GD_STRINGFT && (HAVE_LIBFREETYPE && (HAVE_GD_FONTCACHESHUTDOWN || HAVE_GD_FREEFONTCACHE)) PHP_RSHUTDOWN_FUNCTION(gd) { #if HAVE_GD_FONTCACHESHUTDOWN -- 2.50.1