---------------------
PatchSet 8000 
Date: 2008/07/01 10:30:29
Author: serassio
Branch: nt
Tag: (none) 
Log:
Fix build error

Members: 
	include/squid_mswin.h:1.1.2.16->1.1.2.17 
	src/dns_internal.cc:1.7.2.42->1.7.2.43 

Index: squid3/include/squid_mswin.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/include/squid_mswin.h,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- squid3/include/squid_mswin.h	29 Mar 2008 21:01:42 -0000	1.1.2.16
+++ squid3/include/squid_mswin.h	1 Jul 2008 10:32:42 -0000	1.1.2.17
@@ -1,5 +1,5 @@
 /*
- * $Id: squid_mswin.h,v 1.1.2.16 2008/03/29 21:01:42 serassio Exp $
+ * $Id: squid_mswin.h,v 1.1.2.17 2008/07/01 10:32:42 serassio Exp $
  *
  * AUTHOR: Andrey Shorin <tolsty@tushino.com>
  * AUTHOR: Guido Serassio <serassio@squid-cache.org>
@@ -76,7 +76,6 @@
 #include "default_config_file.h"
 /* Some tricks for MS Compilers */
 #define __STDC__ 1
-#pragma include_alias(<dirent.h>, <direct.h>)
 #define THREADLOCAL __declspec(thread)
 
 #elif defined(__GNUC__) /* gcc environment */
@@ -235,12 +234,9 @@
 #include <ws2spi.h>
 #if defined(_MSC_VER) /* Microsoft C Compiler ONLY */
 #pragma warning (pop)
-#include "readdir.h"
-#else
+#endif
 #include <io.h>
 #include <stdlib.h>
-#include <sys/types.h> 
-#endif
 
 typedef char * caddr_t;
 
Index: squid3/src/dns_internal.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/dns_internal.cc,v
retrieving revision 1.7.2.42
retrieving revision 1.7.2.43
diff -u -r1.7.2.42 -r1.7.2.43
--- squid3/src/dns_internal.cc	1 May 2008 18:43:09 -0000	1.7.2.42
+++ squid3/src/dns_internal.cc	1 Jul 2008 10:30:29 -0000	1.7.2.43
@@ -1,6 +1,6 @@
 
 /*
- * $Id: dns_internal.cc,v 1.7.2.42 2008/05/01 18:43:09 serassio Exp $
+ * $Id: dns_internal.cc,v 1.7.2.43 2008/07/01 10:30:29 serassio Exp $
  *
  * DEBUG: section 78    DNS lookups; interacts with lib/rfc1035.c
  * AUTHOR: Duane Wessels
@@ -390,7 +390,7 @@
 	    t = (char *) xmalloc(Size);
 	    RegQueryValueEx(hndKey, "Domain", NULL, &Type, (LPBYTE) t,
 		&Size);
-	    debugs(78, 1, "Adding domain " << token << " from Registry");
+	    debugs(78, 1, "Adding domain " << t << " from Registry");
 	    idnsAddPathComponent(t);
 	    xfree(t);
 	}
@@ -414,7 +414,7 @@
 
         RegCloseKey(hndKey);
     }
-    if (npc == 0 && ((const char *) t = getMyHostname())) {
+    if (npc == 0 && (t = (char *) getMyHostname())) {
 	t = strchr(t, '.');
 	if (t)
 	    idnsAddPathComponent(t + 1);
@@ -445,7 +445,7 @@
 
             if (Result == ERROR_SUCCESS && Size) {
                 t = (char *) xmalloc(Size);
-                RegQueryValueEx(hndKey, "DhcpNameServer", NULL, &Type, t,
+                RegQueryValueEx(hndKey, "DhcpNameServer", NULL, &Type, (LPBYTE) t,
                                 &Size);
                 token = strtok(t, ", ");
 
@@ -462,7 +462,7 @@
 
             if (Result == ERROR_SUCCESS && Size) {
                 t = (char *) xmalloc(Size);
-                RegQueryValueEx(hndKey, "NameServer", NULL, &Type, t, &Size);
+                RegQueryValueEx(hndKey, "NameServer", NULL, &Type, (LPBYTE) t, &Size);
                 token = strtok(t, ", ");
 
                 while (token) {
@@ -516,7 +516,7 @@
                         if (Result == ERROR_SUCCESS && Size) {
                             t = (char *) xmalloc(Size);
                             RegQueryValueEx(hndKey2, "DhcpNameServer", NULL,
-                                            &Type, t, &Size);
+                                            &Type, (LPBYTE) t, &Size);
                             token = strtok(t, ", ");
 
                             while (token) {
@@ -534,7 +534,7 @@
                         if (Result == ERROR_SUCCESS && Size) {
                             t = (char *) xmalloc(Size);
                             RegQueryValueEx(hndKey2, "NameServer", NULL, &Type,
-                                            t, &Size);
+                                            (LPBYTE) t, &Size);
                             token = strtok(t, ", ");
 
                             while (token) {
@@ -575,7 +575,7 @@
 
             if (Result == ERROR_SUCCESS && Size) {
                 t = (char *) xmalloc(Size);
-                RegQueryValueEx(hndKey, "NameServer", NULL, &Type, t, &Size);
+                RegQueryValueEx(hndKey, "NameServer", NULL, &Type, (LPBYTE) t, &Size);
                 token = strtok(t, ", ");
 
                 while (token) {