From: Pierre Joye <pajoye@php.net>
Date: Mon, 26 Dec 2005 21:46:56 +0000 (+0000)
Subject: - HAVE_GD_DYNAMIC_CTX_EX, always defined
X-Git-Tag: RELEASE_1_0_4~211
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=954a2823a6cb7d5a7a7aa7fcfa41e574b068b644;p=php

- HAVE_GD_DYNAMIC_CTX_EX, always defined
---

diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index 78e8c7e898..a065879c6c 100644
--- 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 47aeb72691..787f2b4dfd 100644
--- 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 7fac1099ff..3809066873 100644
--- 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