nlopess Mon Jan 8 22:52:23 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/gd gd.c php_gd.h
Log:
avoid calling MSHUTDOWN when built without libt1
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.13&r2=1.312.2.20.2.14&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.13 php-src/ext/gd/gd.c:1.312.2.20.2.14
--- php-src/ext/gd/gd.c:1.312.2.20.2.13 Fri Jan 5 15:06:55 2007
+++ php-src/ext/gd/gd.c Mon Jan 8 22:52:22 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.312.2.20.2.13 2007/01/05 15:06:55 iliaa Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.14 2007/01/08 22:52:22 nlopess 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
PHP_MSHUTDOWN(gd),
+#else
+ NULL,
+#endif
NULL,
#if HAVE_LIBGD20 && HAVE_GD_STRINGFT && (HAVE_GD_FONTCACHESHUTDOWN ||
HAVE_GD_FREEFONTCACHE)
PHP_RSHUTDOWN(gd),
@@ -1191,16 +1195,16 @@
}
/* }}} */
+#if HAVE_LIBT1
/* {{{ PHP_MSHUTDOWN_FUNCTION
*/
PHP_MSHUTDOWN_FUNCTION(gd)
{
-#if HAVE_LIBT1
T1_CloseLib();
-#endif
return SUCCESS;
}
/* }}} */
+#endif
/* {{{ PHP_MINIT_FUNCTION
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/php_gd.h?r1=1.59.2.3.2.1&r2=1.59.2.3.2.2&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.1
php-src/ext/gd/php_gd.h:1.59.2.3.2.2
--- php-src/ext/gd/php_gd.h:1.59.2.3.2.1 Mon Jan 1 09:36:01 2007
+++ php-src/ext/gd/php_gd.h Mon Jan 8 22:52:22 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_gd.h,v 1.59.2.3.2.1 2007/01/01 09:36:01 sebastian Exp $ */
+/* $Id: php_gd.h,v 1.59.2.3.2.2 2007/01/08 22:52:22 nlopess 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
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
