From f8202b5513455054464b9388793fa1c7093bfc1d Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Mon, 22 Jul 2019 15:10:08 +0200 Subject: [PATCH] Remove superfluous HAVE_GD_BUNDLED checks If we're compiling the bundled libgd, `HAVE_GD_BUNDLED` is set, so there is no need to check for this macro again. --- ext/gd/libgd/gd_color_match.c | 9 ++------- ext/gd/libgd/gd_filter.c | 6 +----- ext/gd/libgd/gd_rotate.c | 6 +----- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/ext/gd/libgd/gd_color_match.c b/ext/gd/libgd/gd_color_match.c index e6f539bc75..19fdfe6d03 100644 --- a/ext/gd/libgd/gd_color_match.c +++ b/ext/gd/libgd/gd_color_match.c @@ -1,10 +1,5 @@ -#if HAVE_GD_BUNDLED -# include "gd.h" -# include "gdhelpers.h" -#else -# include -# include "libgd/gdhelpers.h" -#endif +#include "gd.h" +#include "gdhelpers.h" #include "gd_intern.h" #include "php.h" diff --git a/ext/gd/libgd/gd_filter.c b/ext/gd/libgd/gd_filter.c index cebaa8785a..566330668e 100644 --- a/ext/gd/libgd/gd_filter.c +++ b/ext/gd/libgd/gd_filter.c @@ -1,8 +1,4 @@ -#if HAVE_GD_BUNDLED -# include "gd.h" -#else -# include -#endif +#include "gd.h" #include "gd_intern.h" diff --git a/ext/gd/libgd/gd_rotate.c b/ext/gd/libgd/gd_rotate.c index 3ec0b5bff2..cc89652f03 100644 --- a/ext/gd/libgd/gd_rotate.c +++ b/ext/gd/libgd/gd_rotate.c @@ -1,8 +1,4 @@ -#if HAVE_GD_BUNDLED -# include "gd.h" -#else -# include -#endif +#include "gd.h" #include "gd_intern.h" #include -- 2.40.0