sniper          Mon Mar 31 03:49:19 2003 EDT

  Modified files:              
    /php4/ext/gd        gd.c php_gd.h 
  Log:
  cleanup
  
Index: php4/ext/gd/gd.c
diff -u php4/ext/gd/gd.c:1.260 php4/ext/gd/gd.c:1.261
--- php4/ext/gd/gd.c:1.260      Wed Mar 26 01:30:45 2003
+++ php4/ext/gd/gd.c    Mon Mar 31 03:49:19 2003
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: gd.c,v 1.260 2003/03/26 06:30:45 sebastian Exp $ */
+/* $Id: gd.c,v 1.261 2003/03/31 08:49:19 sniper Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
    Cold Spring Harbor Labs. */
@@ -323,7 +323,11 @@
        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_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
Index: php4/ext/gd/php_gd.h
diff -u php4/ext/gd/php_gd.h:1.53 php4/ext/gd/php_gd.h:1.54
--- php4/ext/gd/php_gd.h:1.53   Tue Mar 18 07:05:59 2003
+++ php4/ext/gd/php_gd.h        Mon Mar 31 03:49:19 2003
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_gd.h,v 1.53 2003/03/18 12:05:59 ssb Exp $ */
+/* $Id: php_gd.h,v 1.54 2003/03/31 08:49:19 sniper Exp $ */
 
 #ifndef PHP_GD_H
 #define PHP_GD_H
@@ -58,7 +58,9 @@
 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);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to