From: foobar <sniper@php.net>
Date: Mon, 31 Mar 2003 08:49:19 +0000 (+0000)
Subject: cleanup
X-Git-Tag: RELEASE_0_5~260
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d3542a6bc6d461385cee77ef3555393a05cc6fa;p=php

cleanup
---

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index eaa359e05e..1db01779e8 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -323,7 +323,11 @@ zend_module_entry gd_module_entry = {
 	PHP_MINIT(gd),
 	NULL,
 	NULL,
+#if HAVE_LIBGD20 && HAVE_GD_STRINGFT
 	PHP_RSHUTDOWN(gd),
+#else
+	NULL,
+#endif
 	PHP_MINFO(gd),
 	NO_VERSION_YET,
 	STANDARD_MODULE_PROPERTIES
@@ -426,13 +430,13 @@ PHP_MINIT_FUNCTION(gd)
 
 /* {{{ PHP_RSHUTDOWN_FUNCTION
  */
+#if HAVE_LIBGD20 && HAVE_GD_STRINGFT
 PHP_RSHUTDOWN_FUNCTION(gd)
 {
-#if HAVE_LIBGD20 && HAVE_GD_STRINGFT
 	gdFreeFontCache();
-#endif
 	return SUCCESS;
 }
+#endif
 /* }}} */
 
 /* {{{ PHP_MINFO_FUNCTION
diff --git a/ext/gd/php_gd.h b/ext/gd/php_gd.h
index ee5f3b9391..d89c18c553 100644
--- a/ext/gd/php_gd.h
+++ b/ext/gd/php_gd.h
@@ -58,7 +58,9 @@ extern zend_module_entry gd_module_entry;
 PHP_MINFO_FUNCTION(gd);
 PHP_MINIT_FUNCTION(gd);
 PHP_MSHUTDOWN_FUNCTION(gd);
+#if HAVE_LIBGD20 && HAVE_GD_STRINGFT
 PHP_RSHUTDOWN_FUNCTION(gd);
+#endif
 
 PHP_FUNCTION(gd_info);
 PHP_FUNCTION(imagearc);