diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-10-04 18:24:42 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-10-04 18:24:42 +0200 |
| commit | d5494d5e2414e77a4cd57bb55722cd6c6757af1a (patch) | |
| tree | 859199e6e5fcf2bb55ca21ea306813b4aa3328f9 | |
| parent | 713a3fc58c12fae381c1e2fa81cd70ac05d4e86c (diff) | |
| parent | 9a99426e802f554237658a5e8e8fe4c91ddf716a (diff) | |
| download | php-git-d5494d5e2414e77a4cd57bb55722cd6c6757af1a.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
exposing the libxpm version in phpinfo
5.4.9-dev
Conflicts:
NEWS
configure.in
main/php_version.h
| -rw-r--r-- | ext/gd/gd.c | 5 |
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"); |