From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Sat, 27 Aug 2011 07:46:07 +0000 (-0600)
Subject: Portability: use code instead of static initialization
X-Git-Tag: SQUID_3_1_15~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca38adca84de40f814c9229b859808255ec5a395;p=thirdparty%2Fsquid.git

Portability: use code instead of static initialization

g++ 4.4.5 on ARM mis-detects an inizializer's variable size. Give it a hint.
---

diff --git a/src/icmp/testIcmp.cc b/src/icmp/testIcmp.cc
index 12b0117fde..2532f4e72a 100644
--- a/src/icmp/testIcmp.cc
+++ b/src/icmp/testIcmp.cc
@@ -15,7 +15,9 @@ void
 testIcmp::testChecksum()
 {
     stubIcmp icmp;
-    short unsigned int buf[10] = {htons(1),htons(2),htons(3),htons(4),htons(5),htons(6),htons(7),htons(8),htons(9), htons(10)};
+    uint16_t buf[10], tmpval;
+    for (tmpval=0; tmpval < 10; ++tmpval)
+        buf[tmpval]=htons(1+tmpval);
 
     // NULL data
     CPPUNIT_ASSERT_EQUAL((int)htons(0xffff), icmp.testChecksum(NULL,0));