php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 17:22:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

avoid calling MSHUTDOWN when built without libt1

Browse Source
This commit is contained in:
Nuno Lopes
2007-01-08 22:52:22 +00:00
parent 1790b05591
commit 43369cef58
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ext/gd/gd.c
View File

@@ -1147,7 +1147,11 @@ zend_module_entry gd_module_entry = {
"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 @@ static void php_free_gd_font(zend_rsrc_list_entry *rsrc TSRMLS_DC)
}
/* }}} */
#if HAVE_LIBT1
/* {{{ PHP_MSHUTDOWN_FUNCTION
*/
PHP_MSHUTDOWN_FUNCTION(gd)
{
#if HAVE_LIBT1
T1_CloseLib();
#endif
return SUCCESS;
}
/* }}} */
#endif
/* {{{ PHP_MINIT_FUNCTION

2
ext/gd/php_gd.h
View File

@@ -66,7 +66,9 @@ extern zend_module_entry gd_module_entry;
/* 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