cvs: php-src /ext/gd gd.c
| From: | Antony Dovgal | Date: | Thu, 05 Apr 2007 09:32:58 +0000 |
| Subject: | cvs: php-src /ext/gd gd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-43740@lists.php.net to get a copy of this message | ||
tony2001 Thu Apr 5 09:32:58 2007 UTC
Modified files:
/php-src/ext/gd gd.c
Log:
fix build without FreeType
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.368&r2=1.369&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.368 php-src/ext/gd/gd.c:1.369
--- php-src/ext/gd/gd.c:1.368 Wed Apr 4 01:54:34 2007
+++ php-src/ext/gd/gd.c Thu Apr 5 09:32:58 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.368 2007/04/04 01:54:34 pajoye Exp $ */
+/* $Id: gd.c,v 1.369 2007/04/05 09:32:58 tony2001 Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1084,7 +1084,7 @@
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 @@
#if HAVE_LIBT1
T1_CloseLib();
#endif
-#if HAVE_GD_FONTMUTEX
+#if HAVE_GD_FONTMUTEX && HAVE_LIBFREETYPE
gdFontCacheMutexShutdown();
#endif
return SUCCESS;
@@ -1149,7 +1149,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
@@ -1234,7 +1234,7 @@
/* {{{ 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