From: Yang Tse <yangsita@gmail.com>
Date: Fri, 24 Apr 2009 10:38:12 +0000 (+0000)
Subject: Try a simpler variation of the 'volatile' variables icc 9.1 on unix IA32 workaround.
X-Git-Tag: curl-7_19_5~177
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=651b4b9efacfb3742682b8f1d8c97feb3255e2db;p=curl

Try a simpler variation of the 'volatile' variables icc 9.1 on unix IA32 workaround.

Previous workaround proved useful, but triggered the following warning:

warning #556: a value of type "volatile Curl_addrinfo *" cannot be assigned to an entity of type "Curl_addrinfo *"
---

diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c
index 14b2a438b..9d56e6a2f 100644
--- a/lib/curl_addrinfo.c
+++ b/lib/curl_addrinfo.c
@@ -68,18 +68,20 @@
  * any function call which actually allocates a Curl_addrinfo struct.
  */
 
-void
-Curl_freeaddrinfo(Curl_addrinfo *cahead)
-{
 #if defined(__INTEL_COMPILER) && (__INTEL_COMPILER == 910) && \
     defined(__unix__) &&  defined(__i386__)
   /* workaround icc 9.1 optimizer issue */
-  volatile Curl_addrinfo * volatile canext;
-  Curl_addrinfo *ca;
+# define vqualifier volatile
 #else
-  Curl_addrinfo *ca, *canext;
+# define vqualifier
 #endif
 
+void
+Curl_freeaddrinfo(Curl_addrinfo *cahead)
+{
+  Curl_addrinfo *vqualifier canext;
+  Curl_addrinfo *ca;
+
   for(ca = cahead; ca != NULL; ca = canext) {
 
     if(ca->ai_addr)