File 12484.patch of Package squid
---------------------
PatchSet 12484
Date: 2009/06/25 22:47:57
Author: hno
Branch: SQUID_2_7
Tag: (none)
Log:
Author: serassio
MFC: Windows port: Fix PSAPI.DLL usage, is always available on Windows NT and later
Members:
src/win32.c:1.18.2.5->1.18.2.6
Index: squid/src/win32.c
===================================================================
RCS file: /cvsroot/squid/squid/src/win32.c,v
retrieving revision 1.18.2.5
retrieving revision 1.18.2.6
diff -u -r1.18.2.5 -r1.18.2.6
--- squid/src/win32.c 30 Jun 2008 16:20:06 -0000 1.18.2.5
+++ squid/src/win32.c 25 Jun 2009 22:47:57 -0000 1.18.2.6
@@ -1,6 +1,6 @@
/*
- * $Id: win32.c,v 1.18.2.5 2008/06/30 16:20:06 serassio Exp $
+ * $Id: win32.c,v 1.18.2.6 2009/06/25 22:47:57 hno Exp $
*
* Windows support
* AUTHOR: Guido Serassio <serassio@squid-cache.org>
@@ -894,9 +894,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 and later call PSAPI.DLL for process Memory */
/* informations -- Guido Serassio */
HANDLE hProcess;
PROCESS_MEMORY_COUNTERS pmc;