diff options
| author | Nuno Lopes <nlopess@php.net> | 2007-01-08 22:52:22 +0000 |
|---|---|---|
| committer | Nuno Lopes <nlopess@php.net> | 2007-01-08 22:52:22 +0000 |
| commit | 43369cef581d018eea549ff27fa08dc0739154af (patch) | |
| tree | 237b2af1f3a543bf30c2b366d99ea4c02211fb8a | |
| parent | 1790b055915cae2f7dbd91c7d752cc69f921e45e (diff) | |
| download | php-git-43369cef581d018eea549ff27fa08dc0739154af.tar.gz | |
avoid calling MSHUTDOWN when built without libt1
| -rw-r--r-- | ext/gd/gd.c | 8 | ||||
| -rw-r--r-- | ext/gd/php_gd.h | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index d7d6dbb583..573a727a18 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -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 diff --git a/ext/gd/php_gd.h b/ext/gd/php_gd.h index a3fdc4aa5f..11c92879a4 100644 --- a/ext/gd/php_gd.h +++ b/ext/gd/php_gd.h @@ -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 |