summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatoliy Belsky <ab@php.net>2012-10-04 18:21:07 +0200
committerAnatoliy Belsky <ab@php.net>2012-10-04 18:21:07 +0200
commit9a99426e802f554237658a5e8e8fe4c91ddf716a (patch)
tree9537c3e365efa0ea252e203320e5d11e0a4636e8
parent34eb787828d3ef7a773464ace6db40444dcef9a3 (diff)
parent5d9fb8ffeb58d51c44f8a4b9f6b2eaabe271ce82 (diff)
downloadphp-git-9a99426e802f554237658a5e8e8fe4c91ddf716a.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: exposing the libxpm version in phpinfo
-rw-r--r--ext/gd/gd.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 8fa0adec92..cfcc3e876c 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -1328,6 +1328,11 @@ PHP_MINFO_FUNCTION(gd)
#endif
#if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)
php_info_print_table_row(2, "XPM Support", "enabled");
+ {
+ char tmp[12];
+ snprintf(tmp, sizeof(tmp), "%d", XpmLibraryVersion());
+ php_info_print_table_row(2, "libXpm Version", tmp);
+ }
#endif
#ifdef HAVE_GD_XBM
php_info_print_table_row(2, "XBM Support", "enabled");