cvs: php-src /ext/gd config.m4 config.w32 gd.c

pajoye Mon Dec 26 21:46:56 2005 EDT Modified files: /php-src/ext/gd config.m4 config.w32 gd.c Log: - HAVE_GD_DYNAMIC_CTX_EX, always defined http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/config.m4?r1=1.164&r2=1.165&diff_format=u Index: php-src/ext/gd/config.m4 diff -u php-src/ext/gd/config.m4:1.164 php-src/ext/gd/config.m4:1.165 --- php-src/ext/gd/config.m4:1.164 Mon Dec 26 20:44:19 2005 +++ php-src/ext/gd/config.m4 Mon Dec 26 21:46:56 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.164 2005/12/26 20:44:19 pajoye Exp $ +dnl $Id: config.m4,v 1.165 2005/12/26 21:46:56 pajoye Exp $ dnl dnl @@ -332,7 +332,6 @@ AC_DEFINE(HAVE_GD_IMAGEELLIPSE, 1, [ ]) AC_DEFINE(HAVE_GD_IMAGESETBRUSH, 1, [ ]) AC_DEFINE(HAVE_COLORCLOSESTHWB, 1, [ ]) - AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX, 1, [ ]) dnl T1LIB support is gdlib independent PHP_GD_T1LIB http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/config.w32?r1=1.18&r2=1.19&diff_format=u Index: php-src/ext/gd/config.w32 diff -u php-src/ext/gd/config.w32:1.18 php-src/ext/gd/config.w32:1.19 --- php-src/ext/gd/config.w32:1.18 Mon Dec 26 20:44:19 2005 +++ php-src/ext/gd/config.w32 Mon Dec 26 21:46:56 2005 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.18 2005/12/26 20:44:19 pajoye Exp $ +// $Id: config.w32,v 1.19 2005/12/26 21:46:56 pajoye Exp $ // vim:ft=javascript ARG_WITH("gd", "Bundled GD support", "yes,shared"); @@ -32,7 +32,6 @@ gdtables.c gd_topal.c gd_wbmp.c gdxpm.c wbmp.c xbm.c", "gd"); AC_DEFINE('HAVE_LIBGD', 1, 'GD support'); ADD_FLAG("CFLAGS_GD", " \ -/D HAVE_GD_DYNAMIC_CTX_EX=1 \ /D HAVE_GD_BUNDLED=1 \ /D HAVE_GD_GIF_READ=1 \ /D HAVE_GD_GIF_CREATE=1 \ http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/gd.c?r1=1.333&r2=1.334&diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.333 php-src/ext/gd/gd.c:1.334 --- php-src/ext/gd/gd.c:1.333 Mon Dec 26 20:44:19 2005 +++ php-src/ext/gd/gd.c Mon Dec 26 21:46:56 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.333 2005/12/26 20:44:19 pajoye Exp $ */ +/* $Id: gd.c,v 1.334 2005/12/26 21:46:56 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -88,9 +88,7 @@ int gdImageColorClosestHWB(gdImagePtr im, int r, int g, int b); #endif -#ifndef HAVE_GD_DYNAMIC_CTX_EX #define gdNewDynamicCtxEx(len, data, val) gdNewDynamicCtx(len, data) -#endif /* Section Filters Declarations */ /* IMPORTANT NOTE FOR NEW FILTER