From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 10 Apr 2009 05:37:42 +0000 (+1200)
Subject: Author: Guido Serassio <serassio@squid-cache.org>
X-Git-Tag: SQUID_3_1_0_8~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4bae313f4bb371728fc38d423efdd50e9529fc88;p=thirdparty%2Fsquid.git

Author: Guido Serassio <serassio@squid-cache.org>
Windows port: Fix PSAPI.DLL usage, is always available on Windows NT and later
---

diff --git a/src/win32.cc b/src/win32.cc
old mode 100644
new mode 100755
index 46f67d89dd..0707b6c622
--- a/src/win32.cc
+++ b/src/win32.cc
@@ -116,9 +116,8 @@ int 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 and later call PSAPI.DLL for process Memory */
         /* informations -- Guido Serassio                       */
         HANDLE hProcess;
         PROCESS_MEMORY_COUNTERS pmc;