com php-src: fix build with bundled libgd: ext/gd/gd.c ext/gd/php_gd.h
| From: | Remi Collet | Date: | Sat, 04 May 2013 14:51:56 +0000 |
| Subject: | com php-src: fix build with bundled libgd: ext/gd/gd.c ext/gd/php_gd.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72114@lists.php.net to get a copy of this message | ||
Commit: 00b097d2a3bb36dd639311b1175582d81f5cc554
Author: Remi Collet <remi@php.net> Sat, 4 May 2013 16:51:56 +0200
Parents: 2a2ac5f2bef6a779477c76d34c346ac9044185af
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=00b097d2a3bb36dd639311b1175582d81f5cc554
Log:
fix build with bundled libgd
Changed paths:
M ext/gd/gd.c
M ext/gd/php_gd.h
Diff:
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index f412b2f..9b32630 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -29,14 +29,6 @@
#include "config.h"
#endif
-#ifdef HAVE_GD_PNG
-#include <png.h>
-#endif
-
-#ifdef HAVE_GD_JPG
-# include <jpeglib.h>
-#endif
-
#include "php.h"
#include "php_ini.h"
#include "ext/standard/head.h"
@@ -61,6 +53,18 @@
# include <Wingdi.h>
#endif
+#ifdef HAVE_GD_PNG
+# include <png..h>
+#endif
+
+#ifdef HAVE_GD_JPG
+# include <jpeglib.h>
+#endif
+
+#ifdef HAVE_GD_XPM
+# include <X11/xpm.h>
+#endif
+
#ifndef HAVE_GD_BUNDLED
#ifdef HAVE_GD_PNG
const char * gdPngGetVersionString()
diff --git a/ext/gd/php_gd.h b/ext/gd/php_gd.h
index c9c9e9d..269c315 100644
--- a/ext/gd/php_gd.h
+++ b/ext/gd/php_gd.h
@@ -28,7 +28,7 @@
# endif
#endif
-#if HAVE_LIBGD
+#if defined(HAVE_LIBGD) || defined(HAVE_GD_BUNDLED)
/* open_basedir and safe_mode checks */
#define PHP_GD_CHECK_OPEN_BASEDIR(filename, errormsg) \