From: Pierre Joye <pajoye@php.net>
Date: Mon, 7 Jul 2008 08:36:04 +0000 (+0000)
Subject: - restore wrongly removed vars
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1366
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=579a044be300e249790a99a6aac0cd2e106b79ee;p=php

- restore wrongly removed vars
- test if zlib is shared or not (possible conflict)
---

diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
index 5092b761f8..3c38b3f4d6 100644
--- a/ext/gd/config.w32
+++ b/ext/gd/config.w32
@@ -8,12 +8,12 @@ if (PHP_GD != "no") {
 	if (CHECK_LIB("libjpeg.lib", "gd", PHP_GD) &&
 		(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)
+		CHECK_HEADER_ADD_INCLUDE("iconv.h", "CFLAGS_ICONV", PHP_ICONV) &&
+		((!PHP_ZLIB_SHARED) || CHECK_LIB("zlib_a.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 b7154985d6..e66276a98e 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -1906,6 +1906,8 @@ 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;