---------------------
PatchSet 10780 
Date: 2009/03/29 09:26:00
Author: serassio
Branch: nt
Tag: (none) 
Log:
Fix PSAPI.DLL usage: is always available on Windows NT and later

Members: 
	port/win32/default_config_file.cmd:1.1.36.4->1.1.36.5 
	src/win32.c:1.7.8.29->1.7.8.30 

Index: squid/port/win32/default_config_file.cmd
===================================================================
RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/default_config_file.cmd,v
retrieving revision 1.1.36.4
retrieving revision 1.1.36.5
diff -u -r1.1.36.4 -r1.1.36.5
--- squid/port/win32/default_config_file.cmd	29 Mar 2009 08:58:48 -0000	1.1.36.4
+++ squid/port/win32/default_config_file.cmd	29 Mar 2009 09:26:00 -0000	1.1.36.5
@@ -12,4 +12,4 @@
 :print
 
 set DEFINE_TXT=%2
-echo #define %1 "%DEFINE_TXT:~2%
\ No newline at end of file
+echo #define %1 "%DEFINE_TXT:~2%
Index: squid/src/win32.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/win32.c,v
retrieving revision 1.7.8.29
retrieving revision 1.7.8.30
diff -u -r1.7.8.29 -r1.7.8.30
--- squid/src/win32.c	29 Mar 2009 09:01:22 -0000	1.7.8.29
+++ squid/src/win32.c	29 Mar 2009 09:26:00 -0000	1.7.8.30
@@ -892,9 +892,8 @@
 WIN32_getrusage(int who, struct rusage *usage)
 {
 #if HAVE_WIN32_PSAPI
-    if ((WIN32_OS_version == _WIN_OS_WINNT) || (WIN32_OS_version == _WIN_OS_WIN2K)
-	|| (WIN32_OS_version == _WIN_OS_WINXP) || (WIN32_OS_version == _WIN_OS_WINNET)) {
-	/* On Windows NT/2000 call PSAPI.DLL for process Memory */
+    if (WIN32_OS_version >= _WIN_OS_WINNT) {
+	/* On Windows NT an later call PSAPI.DLL for process Memory */
 	/* informations -- Guido Serassio                       */
 	HANDLE hProcess;
 	PROCESS_MEMORY_COUNTERS pmc;