- 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 0533d8b2b50f04cc767975514d9633b8b63855ef..aea72f38bbedfd72560cd88500c063d208af581d 100644 (file)
--- 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 9369854e24d7a06c8590e37c222ad6558787e270..755f82501234efc0e9b6096980f8cf2042f9c5ed 100644 (file)
--- 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