- HAVE_GD_DYNAMIC_CTX_EX, always defined

diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index 78e8c7e898a24ec2cca7d8da9cc45e3795c9fd14..a065879c6c3897ced28f13a1ac8190f9d6b979bd 100644 (file)
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -332,7 +332,6 @@ dnl FIXME: Cleanup the sources so that these are not needed!
   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

diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index 47aeb72691eec1f26d3d24c8368a2ec64fcdb797..787f2b4dfde9b41242d33568961721f41ecb316f 100644 (file)
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -32,7 +32,6 @@ if (PHP_GD != "no") {
                        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  \

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 7fac1099ff27a607423427bdedc4a1026e00b23f..38090668738fd1571d4df848da4db9487e7d34c1 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -88,9 +88,7 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int, int);
 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