nlopess Mon Jan 8 22:56:26 2007 UTC Modified files: /php-src/ext/gd gd.c php_gd.h Log: MFB http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.364&r2=1.365&diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.364 php-src/ext/gd/gd.c:1.365 --- php-src/ext/gd/gd.c:1.364 Mon Jan 1 09:29:24 2007 +++ php-src/ext/gd/gd.c Mon Jan 8 22:56:25 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.364 2007/01/01 09:29:24 sebastian Exp $ */ +/* $Id: gd.c,v 1.365 2007/01/08 22:56:25 nlopess Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -1078,7 +1078,11 @@ "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 @@ } /* }}} */ +#if HAVE_LIBT1 /* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(gd) { -#if HAVE_LIBT1 T1_CloseLib(); -#endif return SUCCESS; } /* }}} */ +#endif /* {{{ PHP_MINIT_FUNCTION http://cvs.php.net/viewvc.cgi/php-src/ext/gd/php_gd.h?r1=1.71&r2=1.72&diff_format=u Index: php-src/ext/gd/php_gd.h diff -u php-src/ext/gd/php_gd.h:1.71 php-src/ext/gd/php_gd.h:1.72 --- php-src/ext/gd/php_gd.h:1.71 Mon Jan 1 09:29:24 2007 +++ php-src/ext/gd/php_gd.h Mon Jan 8 22:56:26 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_gd.h,v 1.71 2007/01/01 09:29:24 sebastian Exp $ */ +/* $Id: php_gd.h,v 1.72 2007/01/08 22:56:26 nlopess Exp $ */ #ifndef PHP_GD_H #define PHP_GD_H @@ -64,7 +64,9 @@ /* 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
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php