From c9d7050fa1f15bdb5affeca9271367e2aa2ed84c Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Mon, 7 Jul 2008 08:40:04 +0000 Subject: [PATCH] - add support for old named zlib (no _a or dynamic) - nuke the right unused vars --- ext/gd/config.w32 | 2 +- ext/gd/gd.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ext/gd/config.w32 b/ext/gd/config.w32 index 3c38b3f4d6..4205ce4d77 100644 --- a/ext/gd/config.w32 +++ b/ext/gd/config.w32 @@ -13,7 +13,7 @@ if (PHP_GD != "no") { (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) && - ((!PHP_ZLIB_SHARED) || CHECK_LIB("zlib_a.lib", "gd", PHP_GD)) + ((!PHP_ZLIB_SHARED) || CHECK_LIB("zlib_a.lib", "gd", PHP_GD) || CHECK_LIB("zlib.lib", "gd", PHP_GD)) ) { 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..f07279ddc0 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -1994,8 +1994,6 @@ PHP_FUNCTION(imagegrabscreen) HDC memDC; HBITMAP memBM; HBITMAP hOld; - HINSTANCE handle; - long lwindow_handle; typedef BOOL (WINAPI *tPrintWindow)(HWND, HDC,UINT); tPrintWindow pPrintWindow = 0; gdImagePtr im; -- 2.40.0