From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 19 Mar 2009 03:01:16 +0000 (+1200)
Subject: Author: Henrik Nordstrom <henrik@henriknordstrom.net>
X-Git-Tag: SQUID_3_1_0_7~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0ee880d4b71ec11b4b5b86de7f409c19ebce813f;p=thirdparty%2Fsquid.git

Author: Henrik Nordstrom <henrik@henriknordstrom.net>
Make GCC-4.4 happy
---

diff --git a/src/adaptation/icap/OptXact.h b/src/adaptation/icap/OptXact.h
index 4c5f7cf3f0..3fe0ec8346 100644
--- a/src/adaptation/icap/OptXact.h
+++ b/src/adaptation/icap/OptXact.h
@@ -40,9 +40,6 @@
 namespace Adaptation {
 namespace Icap {
 
-class Adaptation::Icap::Options;
-
-
 /* OptXact sends an ICAP OPTIONS request to the ICAP service,
  * parses the ICAP response, and sends it to the initiator. A NULL response
  * means the ICAP service could not be contacted or did not return any
diff --git a/src/wccp2.cc b/src/wccp2.cc
index bb34d44804..1382d27053 100644
--- a/src/wccp2.cc
+++ b/src/wccp2.cc
@@ -1173,7 +1173,9 @@ wccp2HandleUdp(int sock, void *not_used)
     /* Go through the data structure */
     while (data_length > offset) {
 
-        header = (struct wccp2_item_header_t *) &wccp2_i_see_you.data[offset];
+	char *data = wccp2_i_see_you.data;
+
+        header = (struct wccp2_item_header_t *) &data[offset];
 
         switch (ntohs(header->type)) {
 
@@ -1392,6 +1394,7 @@ wccp2HandleUdp(int sock, void *not_used)
 
         for (num_caches = 0; num_caches < (int) ntohl(tmp); num_caches++) {
             /* Get a copy of the ip */
+	   memset(&cache_address, 0, sizeof(cache_address)); // Make GCC happy
 
             switch (Config.Wccp2.assignment_method) {