avoid calling MSHUTDOWN when built without libt1

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index d7d6dbb583770b2ba8782da1bfde698a76af2591..573a727a181ebf6ea78b05329c96785a2919c2ac 100644 (file)
--- 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 a3fdc4aa5f9424df1329783c422420156b314907..11c92879a4d9cc8b56a4503c6b408e5a195f83b1 100644 (file)
--- 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