From: robertc <>
Date: Thu, 23 Jan 2003 07:59:44 +0000 (+0000)
Subject: sbrk void to char * fix, and client_side_request header tweak
X-Git-Tag: SQUID_3_0_PRE1~438
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=90f396d585c1d214936106997957fd10bf00d44b;p=thirdparty%2Fsquid.git

sbrk void to char * fix, and client_side_request header tweak
---

diff --git a/src/client_side_request.h b/src/client_side_request.h
index 76ac6f0332..07c8f638f5 100644
--- a/src/client_side_request.h
+++ b/src/client_side_request.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_request.h,v 1.2 2003/01/23 00:37:18 robertc Exp $
+ * $Id: client_side_request.h,v 1.3 2003/01/23 00:59:44 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -40,6 +40,7 @@
 /* client_side_request.c - client side request related routines (pure logic) */
 extern int clientBeginRequest(method_t, char const *, CSCB *, CSD *, void *, HttpHeader const *, char *, size_t);
 
+class MemObject;
 typedef class ClientHttpRequest clientHttpRequest;
 
 class ClientHttpRequest {
diff --git a/src/stat.cc b/src/stat.cc
index 0aea4a3ed7..fe50c31db9 100644
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: stat.cc,v 1.366 2003/01/23 00:37:25 robertc Exp $
+ * $Id: stat.cc,v 1.367 2003/01/23 00:59:44 robertc Exp $
  *
  * DEBUG: section 18    Cache Manager Statistics
  * AUTHOR: Harvest Derived
@@ -479,7 +479,7 @@ info_get(StoreEntry * sentry)
 	statCPUUsage(60));
 #if HAVE_SBRK
     storeAppendPrintf(sentry, "\tProcess Data Segment Size via sbrk(): %d KB\n",
-	(sbrk(0) - sbrk_start) >> 10);
+	((char *)sbrk(0) - (char *)sbrk_start) >> 10);
 #endif
     storeAppendPrintf(sentry, "\tMaximum Resident Size: %d KB\n",
 	rusage_maxrss(&rusage));