- add support for old named zlib (no _a or dynamic)

- nuke the right unused vars

diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index 3c38b3f4d6f821828a5f327e4cd62e0be49f9b16..4205ce4d770072b47e327fe7b30d15f4144d6229 100644 (file)
--- 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 e66276a98eaa486d04158d7d03b1c71ba2d41e79..f07279ddc0f3a89e4e42107e6e983888200d33db 100644 (file)
--- 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;