diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-07-22 15:10:08 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-07-22 15:59:44 +0200 |
| commit | f8202b5513455054464b9388793fa1c7093bfc1d (patch) | |
| tree | 409ee700c13127ca3c41df86a82c81a7044b462c | |
| parent | 72b9105d30e17463554d81059df249acc8b3aa94 (diff) | |
| download | php-git-f8202b5513455054464b9388793fa1c7093bfc1d.tar.gz | |
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.
| -rw-r--r-- | ext/gd/libgd/gd_color_match.c | 9 | ||||
| -rw-r--r-- | ext/gd/libgd/gd_filter.c | 6 | ||||
| -rw-r--r-- | 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 <gd.h> -# 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 <gd.h> -#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 <gd.h> -#endif +#include "gd.h" #include "gd_intern.h" #include <math.h> |