From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 7 Jun 2009 12:00:21 +0000 (+1200)
Subject: Author: Guido Serassio <serassio@squid-cache.org>
X-Git-Tag: SQUID_3_0_STABLE16~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c6c8eef7d97d692fef25d651a793e87d337cafc;p=thirdparty%2Fsquid.git

Author: Guido Serassio <serassio@squid-cache.org>
Windows port: Fix configure and build failures on MinGW.
---

diff --git a/src/dns_internal.cc b/src/dns_internal.cc
index 5ac806050b..3f38a479ed 100755
--- a/src/dns_internal.cc
+++ b/src/dns_internal.cc
@@ -481,15 +481,14 @@ idnsParseWIN32Registry(void)
 
 	if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, REG_TCPIP_PARA_INTERFACES, 0, KEY_READ, &hndKey) == ERROR_SUCCESS) {
             int i;
-	    int MaxSubkeyLen;
-	    DWORD InterfacesCount;
+	    DWORD MaxSubkeyLen, InterfacesCount;
 	    char *keyname;
 	    FILETIME ftLastWriteTime;
 
 	    if (RegQueryInfoKey(hndKey, NULL, NULL, NULL, &InterfacesCount, &MaxSubkeyLen, NULL, NULL, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) {
 		keyname = (char *) xmalloc(++MaxSubkeyLen);
 		for (i = 0; i < (int) InterfacesCount; i++) {
-		    int j;
+		    DWORD j;
 		    j = MaxSubkeyLen;
 		    if (RegEnumKeyEx(hndKey, i, keyname, &j, NULL, NULL, NULL, &ftLastWriteTime) == ERROR_SUCCESS) {
 			char *newkeyname;
@@ -504,7 +503,7 @@ idnsParseWIN32Registry(void)
 			    Result = RegQueryValueEx(hndKey2, "DhcpNameServer", NULL, &Type, NULL, &Size);
 			    if (Result == ERROR_SUCCESS && Size) {
 				t = (char *) xmalloc(Size);
-				RegQueryValueEx(hndKey2, "DhcpNameServer", NULL, &Type, t, &Size);
+				RegQueryValueEx(hndKey2, "DhcpNameServer", NULL, &Type, (LPBYTE)t, &Size);
 				token = strtok(t, ", ");
 				while (token) {
                                     debugs(78, 1, "Adding DHCP nameserver " << token << " from Registry");
@@ -517,7 +516,7 @@ idnsParseWIN32Registry(void)
 			    Result = RegQueryValueEx(hndKey2, "NameServer", NULL, &Type, NULL, &Size);
 			    if (Result == ERROR_SUCCESS && Size) {
 				t = (char *) xmalloc(Size);
-				RegQueryValueEx(hndKey2, "NameServer", NULL, &Type, t, &Size);
+				RegQueryValueEx(hndKey2, "NameServer", NULL, &Type, (LPBYTE)t, &Size);
 				token = strtok(t, ", ");
 				while (token) {
 				    debugs(78, 1, "Adding nameserver " << token << " from Registry");