From: Pierre Joye <pajoye@php.net>
Date: Wed, 4 Apr 2007 01:58:24 +0000 (+0000)
Subject: - MFH: don't declare MSHUTDOWN if both cachesetup and t1lib are not used
X-Git-Tag: php-5.2.2RC1~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89ad25f1af3326c603b0d3f613742ed588aaf7f7;p=php

- MFH: don't declare MSHUTDOWN if both cachesetup and t1lib are not used
---

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index f738863b74..96f58aa14c 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 || HAVE_GD_FONTMUTEX
 	PHP_MSHUTDOWN(gd),
+#else
+	NULL,
+#endif
 	NULL,
 #if HAVE_LIBGD20 && HAVE_GD_STRINGFT && (HAVE_GD_FONTCACHESHUTDOWN || HAVE_GD_FREEFONTCACHE)
 	PHP_RSHUTDOWN(gd),
@@ -1194,6 +1198,7 @@ static void php_free_gd_font(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 
 /* {{{ PHP_MSHUTDOWN_FUNCTION
  */
+#if HAVE_LIBT1 || HAVE_GD_FONTMUTEX
 PHP_MSHUTDOWN_FUNCTION(gd)
 {
 #if HAVE_LIBT1
@@ -1204,6 +1209,7 @@ PHP_MSHUTDOWN_FUNCTION(gd)
 #endif
 	return SUCCESS;
 }
+#endif
 /* }}} */
 
 
diff --git a/ext/gd/php_gd.h b/ext/gd/php_gd.h
index a3fdc4aa5f..528057a19f 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 || HAVE_GD_FONTMUTEX
 PHP_MSHUTDOWN_FUNCTION(gd);
+#endif
 #if HAVE_LIBGD20 && HAVE_GD_STRINGFT
 PHP_RSHUTDOWN_FUNCTION(gd);
 #endif