diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2018-10-13 14:12:55 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-13 14:12:55 +0200 |
| commit | 7f6387b59ae1b5d642b0d05afbb14cab07061a9a (patch) | |
| tree | d09f6f4674163b6a57d8805408877b05294f6931 /ext/gd | |
| parent | 3f72c77ce47ee0906905b83161d9c1d24e425d89 (diff) | |
| download | php-git-7f6387b59ae1b5d642b0d05afbb14cab07061a9a.tar.gz | |
Trim trailing whitespace in source code files
Diffstat (limited to 'ext/gd')
| -rw-r--r-- | ext/gd/config.m4 | 2 | ||||
| -rw-r--r-- | ext/gd/config.w32 | 6 | ||||
| -rw-r--r-- | ext/gd/tests/func.inc | 16 |
3 files changed, 12 insertions, 12 deletions
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index 1bc5f98ccf..7ed155e66d 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -356,7 +356,7 @@ dnl if test "$PHP_GD" != "no"; then PHP_NEW_EXTENSION(gd, gd.c $extra_sources, $ext_shared,, \\$(GDLIB_CFLAGS)) - if test "$GD_MODULE_TYPE" = "builtin"; then + if test "$GD_MODULE_TYPE" = "builtin"; then PHP_ADD_BUILD_DIR($ext_builddir/libgd) GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS" GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/" diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index 71cbe9c4ae..d912110fc1 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -15,8 +15,8 @@ if (PHP_GD != "no") { CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng15") || CHECK_HEADER_ADD_INCLUDE("png.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\libpng12")) && (CHECK_LIB("libiconv_a.lib;libiconv.lib", "gd", PHP_GD) || CHECK_LIB("iconv_a.lib;iconv.lib", "gd", PHP_GD)) && - CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD) && - (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "gd", PHP_GD) )) || + CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_GD", PHP_GD) && + (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "gd", PHP_GD) )) || (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "gd", PHP_GD)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) && CHECK_LIB("libXpm_a.lib", "gd", PHP_GD) && CHECK_HEADER_ADD_INCLUDE("xpm.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\X11") @@ -78,7 +78,7 @@ if (PHP_GD != "no") { if (ICC_TOOLSET) { ADD_FLAG("LDFLAGS_GD", "/nodefaultlib:libcmt"); } - + PHP_INSTALL_HEADERS("", "ext/gd ext/gd/libgd" ); } else { WARNING("gd not enabled; libraries and headers not found"); diff --git a/ext/gd/tests/func.inc b/ext/gd/tests/func.inc index 1928ff696a..014d2e1644 100644 --- a/ext/gd/tests/func.inc +++ b/ext/gd/tests/func.inc @@ -18,44 +18,44 @@ function get_php_info() function get_freetype_version() { $version = 0; - + if (preg_match(',FreeType Version => (\d+\.\d+\.\d+),s', get_php_info(), $match)) { $version = $match[1]; } - + return $version; } function get_libjpeg_version() { $version = 0; - + if (preg_match(',libJPEG Version => ([a-z0-9]+),s', get_php_info(), $match)) { $version = $match[1]; } - + return $version; } function get_libpng_version() { $version = 0; - + if (preg_match(',libPNG Version => (\d+\.\d+\.\d+),s', get_php_info(), $match)) { $version = $match[1]; } - + return $version; } function get_libxpm_version() { $version = 0; - + if (preg_match(',libXpm Version => (\d+),s', get_php_info(), $match)) { $version = $match[1]; } - + return $version; } |