tony2001 Thu Apr 5 09:33:10 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/gd gd.c
Log:
MFH: fix build
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.17&r2=1.312.2.20.2.18&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.17 php-src/ext/gd/gd.c:1.312.2.20.2.18
--- php-src/ext/gd/gd.c:1.312.2.20.2.17 Wed Apr 4 01:58:24 2007
+++ php-src/ext/gd/gd.c Thu Apr 5 09:33:10 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.312.2.20.2.17 2007/04/04 01:58:24 pajoye Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.18 2007/04/05 09:33:10 tony2001 Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1153,7 +1153,7 @@
NULL,
#endif
NULL,
-#if HAVE_LIBGD20 && HAVE_GD_STRINGFT && (HAVE_GD_FONTCACHESHUTDOWN ||
HAVE_GD_FREEFONTCACHE)
+#if HAVE_LIBGD20 && HAVE_GD_STRINGFT && (HAVE_LIBFREETYPE &&
(HAVE_GD_FONTCACHESHUTDOWN || HAVE_GD_FREEFONTCACHE))
PHP_RSHUTDOWN(gd),
#else
NULL,
@@ -1204,7 +1204,7 @@
#if HAVE_LIBT1
T1_CloseLib();
#endif
-#if HAVE_GD_FONTMUTEX
+#if HAVE_GD_FONTMUTEX && HAVE_LIBFREETYPE
gdFontCacheMutexShutdown();
#endif
return SUCCESS;
@@ -1219,7 +1219,7 @@
{
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
@@ -1305,7 +1305,7 @@
/* {{{ PHP_RSHUTDOWN_FUNCTION
*/
-#if HAVE_LIBGD20 && HAVE_GD_STRINGFT && (HAVE_GD_FONTCACHESHUTDOWN ||
HAVE_GD_FREEFONTCACHE)
+#if HAVE_LIBGD20 && HAVE_GD_STRINGFT && (HAVE_LIBFREETYPE &&
(HAVE_GD_FONTCACHESHUTDOWN || HAVE_GD_FREEFONTCACHE))
PHP_RSHUTDOWN_FUNCTION(gd)
{
#if HAVE_GD_FONTCACHESHUTDOWN
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
