From: Pierre Joye Date: Fri, 6 Apr 2007 15:38:35 +0000 (+0000) Subject: - Fix windows mutex intialization, add HAVE_GD_FONTMUTEX and HAVE_LIBFREETYPE X-Git-Tag: php-5.2.2RC1~33 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17eaaea1f7c16b6012a0fadef821dcc302dd13bf;p=php - Fix windows mutex intialization, add HAVE_GD_FONTMUTEX and HAVE_LIBFREETYPE to config.w32 (Thanks to Frank for the report) --- diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index 0533d8b2b5..aea72f38bb 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -40,6 +40,8 @@ if (PHP_GD != "no") { /D HAVE_GDIMAGECOLORRESOLVE=1 \ /D HAVE_GD_IMAGESETBRUSH=1 \ /D HAVE_GD_IMAGESETTILE=1 \ +/D HAVE_GD_FONTMUTEX=1 \ +/D HAVE_LIBFREETYPE=1 \ /D HAVE_GD_JPG \ /D HAVE_GD_PNG \ /D HAVE_GD_STRINGFTEX=1 \ diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 9369854e24..755f825012 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -1219,6 +1219,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 && HAVE_LIBFREETYPE gdFontCacheMutexSetup(); #endif