diff options
| author | Pierre Joye <pajoye@php.net> | 2008-07-06 17:06:43 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2008-07-06 17:06:43 +0000 |
| commit | ed1e8ca285de9067d1c7c4add7067b4533cf4857 (patch) | |
| tree | 9f5fb31408405fc2fdb15137f2f41609aeb5e352 | |
| parent | ec8a21dd95e9e765f1b09466e42586935b06fb51 (diff) | |
| download | php-git-ed1e8ca285de9067d1c7c4add7067b4533cf4857.tar.gz | |
- update lib/headers detection
- nuke unused variables
| -rw-r--r-- | ext/gd/config.w32 | 11 | ||||
| -rw-r--r-- | ext/gd/gd.c | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index 774722af32..5092b761f8 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -6,9 +6,14 @@ ARG_WITH("t1lib", "t1lib support", "yes"); if (PHP_GD != "no") { if (CHECK_LIB("libjpeg.lib", "gd", PHP_GD) && - CHECK_LIB("freetype2.lib", "gd", PHP_GD) && - CHECK_LIB("libpng.lib", "gd", PHP_GD) && - CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD + ";ext\\gd\\libgd") + (CHECK_LIB("freetype.lib", "gd", PHP_GD) || CHECK_LIB("freetype2.lib", "gd", PHP_GD) ) && + (CHECK_LIB("libpng_a.lib", "gd", PHP_GD) || CHECK_LIB("libpng.lib", "gd", PHP_GD) ) && + (CHECK_LIB("zlib_a.lib", "gd", PHP_GD) || CHECK_LIB("zlib.lib", "gd", PHP_GD) ) && + (CHECK_LIB("libiconv_a.lib", "gd", PHP_GD) || CHECK_LIB("libiconv.lib", "gd", PHP_GD) ) && + CHECK_HEADER_ADD_INCLUDE("gd.h", "CFLAGS_GD", PHP_GD + ";ext\\gd\\libgd") && + (CHECK_LIB("libiconv_a.lib", "iconv", PHP_ICONV) || CHECK_LIB("libiconv.lib", "iconv", PHP_ICONV) || + CHECK_LIB("iconv_a.lib", "iconv", PHP_ICONV) || CHECK_LIB("iconv.lib", "iconv", PHP_ICONV)) && + CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_ICONV", PHP_ICONV) ) { if (PHP_T1LIB != "no") { if (CHECK_LIB("T1_StaticMD.lib", "gd", PHP_GD) && diff --git a/ext/gd/gd.c b/ext/gd/gd.c index e66276a98e..b7154985d6 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -1906,8 +1906,6 @@ PHP_FUNCTION(imagegrabwindow) HDC memDC; HBITMAP memBM; HBITMAP hOld; - HINSTANCE handle; - long lwindow_handle; typedef BOOL (WINAPI *tPrintWindow)(HWND, HDC,UINT); tPrintWindow pPrintWindow = 0; gdImagePtr im; |