com php-src: gd: don't include png.h (breaks build on some old version), so report libPNG version only with external libgd: ext/gd/gd.c
| From: | Remi Collet | Date: | Sun, 05 May 2013 06:35:29 +0000 |
| Subject: | com php-src: gd: don't include png.h (breaks build on some old version), so report libPNG version only with external libgd: ext/gd/gd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72128@lists.php.net to get a copy of this message | ||
Commit: 9a48b6506cf1b4d98fa7d4e15f851430b6c07ada
Author: Remi Collet <remi@php.net> Sun, 5 May 2013 08:35:29 +0200
Parents: 54d6f8b34e20f58a9b2d5e0986480f8b6e1280fa
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9a48b6506cf1b4d98fa7d4e15f851430b6c07ada
Log:
gd: don't include png.h (breaks build on some old version), so report libPNG version only with
external libgd
Changed paths:
M ext/gd/gd.c
Diff:
diff --git a/ext/gd/gd..c b/ext/gd/gd.c
index 9b32630..6147353 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -53,10 +53,6 @@
# include <Wingdi.h>
#endif
-#ifdef HAVE_GD_PNG
-# include <png.h>
-#endif
-
#ifdef HAVE_GD_JPG
# include <jpeglib.h>
#endif
@@ -66,13 +62,6 @@
#endif
#ifndef HAVE_GD_BUNDLED
-#ifdef HAVE_GD_PNG
-const char * gdPngGetVersionString()
-{
- return PNG_LIBPNG_VER_STRING;
-}
-#endif /* HAVE_GD_PNG */
-
#ifdef HAVE_GD_JPG
int gdJpegGetVersionInt()
{
@@ -1361,8 +1350,10 @@ PHP_MINFO_FUNCTION(gd)
#ifdef HAVE_GD_PNG
php_info_print_table_row(2, "PNG Support", "enabled");
+#ifndef HAVE_GD_BUNDLED
php_info_print_table_row(2, "libPNG Version", gdPngGetVersionString());
#endif
+#endif
php_info_print_table_row(2, "WBMP Support", "enabled");
#if defined(HAVE_GD_XPM)
php_info_print_table_row(2, "XPM Support", "enabled");