]> granicus.if.org Git - php/commitdiff
Remove superfluous HAVE_GD_BUNDLED checks
authorChristoph M. Becker <cmbecker69@gmx.de>
Mon, 22 Jul 2019 13:10:08 +0000 (15:10 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Mon, 22 Jul 2019 13:59:44 +0000 (15:59 +0200)
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
ext/gd/libgd/gd_filter.c
ext/gd/libgd/gd_rotate.c

index e6f539bc75b5520001fbad71fda977d7c5fdd96c..19fdfe6d031d62fdfd0b0f1983a21bfbd6703f15 100644 (file)
@@ -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"
index cebaa8785aa712ab3a868ea0405afd9d4801a21a..566330668ea25cd1ee72133954b7c13fe4a1cbf1 100644 (file)
@@ -1,8 +1,4 @@
-#if HAVE_GD_BUNDLED
-# include "gd.h"
-#else
-# include <gd.h>
-#endif
+#include "gd.h"
 
 #include "gd_intern.h"
 
index 3ec0b5bff2d11ee112df02aebf8e12309fdab556..cc89652f03f794688abd9ec079188e761992f15b 100644 (file)
@@ -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>