pajoye Wed Apr 4 01:58:24 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/gd gd.c php_gd.h
Log:
- MFH: don't declare MSHUTDOWN if both cachesetup and t1lib are not used
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.16&r2=1.312.2.20.2.17&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.16 php-src/ext/gd/gd.c:1.312.2.20.2.17
--- php-src/ext/gd/gd.c:1.312.2.20.2.16 Wed Apr 4 00:47:55 2007
+++ php-src/ext/gd/gd.c Wed Apr 4 01:58:24 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.312.2.20.2.16 2007/04/04 00:47:55 pajoye Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.17 2007/04/04 01:58:24 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -1147,7 +1147,11 @@
"gd",
gd_functions,
PHP_MINIT(gd),
+#if HAVE_LIBT1 || HAVE_GD_FONTMUTEX
PHP_MSHUTDOWN(gd),
+#else
+ NULL,
+#endif
NULL,
#if HAVE_LIBGD20 && HAVE_GD_STRINGFT && (HAVE_GD_FONTCACHESHUTDOWN ||
HAVE_GD_FREEFONTCACHE)
PHP_RSHUTDOWN(gd),
@@ -1194,6 +1198,7 @@
/* {{{ PHP_MSHUTDOWN_FUNCTION
*/
+#if HAVE_LIBT1 || HAVE_GD_FONTMUTEX
PHP_MSHUTDOWN_FUNCTION(gd)
{
#if HAVE_LIBT1
@@ -1204,6 +1209,7 @@
#endif
return SUCCESS;
}
+#endif
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/php_gd.h?r1=1.59.2.3.2.3&r2=1.59.2.3.2.4&diff_format=u
Index: php-src/ext/gd/php_gd.h
diff -u php-src/ext/gd/php_gd.h:1.59.2.3.2.3
php-src/ext/gd/php_gd.h:1.59.2.3.2.4
--- php-src/ext/gd/php_gd.h:1.59.2.3.2.3 Wed Apr 4 00:47:55 2007
+++ php-src/ext/gd/php_gd.h Wed Apr 4 01:58:24 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_gd.h,v 1.59.2.3.2.3 2007/04/04 00:47:55 pajoye Exp $ */
+/* $Id: php_gd.h,v 1.59.2.3.2.4 2007/04/04 01:58:24 pajoye Exp $ */
#ifndef PHP_GD_H
#define PHP_GD_H
@@ -66,7 +66,9 @@
/* gd.c functions */
PHP_MINFO_FUNCTION(gd);
PHP_MINIT_FUNCTION(gd);
+#if HAVE_LIBT1 || HAVE_GD_FONTMUTEX
PHP_MSHUTDOWN_FUNCTION(gd);
+#endif
#if HAVE_LIBGD20 && HAVE_GD_STRINGFT
PHP_RSHUTDOWN_FUNCTION(gd);
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
