MFB

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index e06114b99873610b8b15ada7a6acea7bec546b17..b291614bd614a672dee5fd5cfb9645c8b36673e7 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -1078,7 +1078,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_GD_STRINGFT && (HAVE_GD_FONTCACHESHUTDOWN || HAVE_GD_FREEFONTCACHE)
        PHP_RSHUTDOWN(gd),
@@ -1122,16 +1126,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 006f0f44e4f4bd3e9f75f0e9e44aa209066ae41b..3fce82350b7f49f13de53cc32408d173ec16474f 100644 (file)
--- a/ext/gd/php_gd.h
+++ b/ext/gd/php_gd.h
@@ -64,7 +64,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_GD_STRINGFT
 PHP_RSHUTDOWN_FUNCTION(gd);
 #endif