From: Yang Tse <yangsita@gmail.com>
Date: Wed, 1 Jun 2011 10:13:42 +0000 (+0200)
Subject: warnless: icc 9.1 workaround
X-Git-Tag: curl-7_21_7~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a689072f33ae5a3a59586fb419b2e3d6a74f5482;p=thirdparty%2Fcurl.git

warnless: icc 9.1 workaround
---

diff --git a/lib/warnless.c b/lib/warnless.c
index 8a2211019a..37d15ce87d 100644
--- a/lib/warnless.c
+++ b/lib/warnless.c
@@ -296,18 +296,26 @@ void curlx_FD_ZERO(fd_set *fdset)
 
 unsigned short curlx_htons(unsigned short usnum)
 {
+#if (__INTEL_COMPILER == 910) && defined(__i386__)
+  return (unsigned short)(((usnum << 8) & 0xFF00) | ((usnum >> 8) & 0x00FF));
+#else
   #pragma warning(push)
   #pragma warning(disable:810) /* conversion may lose significant bits */
   return htons(usnum);
   #pragma warning(pop)
+#endif
 }
 
 unsigned short curlx_ntohs(unsigned short usnum)
 {
+#if (__INTEL_COMPILER == 910) && defined(__i386__)
+  return (unsigned short)(((usnum << 8) & 0xFF00) | ((usnum >> 8) & 0x00FF));
+#else
   #pragma warning(push)
   #pragma warning(disable:810) /* conversion may lose significant bits */
   return ntohs(usnum);
   #pragma warning(pop)
+#endif
 }
 
 #endif /* __INTEL_COMPILER && __unix__ */