From: Yang Tse <yangsita@gmail.com>
Date: Sat, 15 Dec 2012 19:31:42 +0000 (+0100)
Subject: warnless.c: fix compiler warnings
X-Git-Tag: curl-7_29_0~210
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f6af9d9886ae49963bec0fda7dc6ea8720bbc20c;p=thirdparty%2Fcurl.git

warnless.c: fix compiler warnings
---

diff --git a/lib/warnless.c b/lib/warnless.c
index f621383567..9cc7be9d3f 100644
--- a/lib/warnless.c
+++ b/lib/warnless.c
@@ -204,7 +204,9 @@ unsigned long curlx_uztoul(size_t uznum)
 # pragma warning(disable:810) /* conversion may lose significant bits */
 #endif
 
+#if (CURL_SIZEOF_LONG < SIZEOF_SIZE_T)
   DEBUGASSERT(uznum <= (size_t) CURL_MASK_ULONG);
+#endif
   return (unsigned long)(uznum & (size_t) CURL_MASK_ULONG);
 
 #ifdef __INTEL_COMPILER
@@ -223,7 +225,9 @@ unsigned int curlx_uztoui(size_t uznum)
 # pragma warning(disable:810) /* conversion may lose significant bits */
 #endif
 
+#if (SIZEOF_INT < SIZEOF_SIZE_T)
   DEBUGASSERT(uznum <= (size_t) CURL_MASK_UINT);
+#endif
   return (unsigned int)(uznum & (size_t) CURL_MASK_UINT);
 
 #ifdef __INTEL_COMPILER
@@ -243,7 +247,9 @@ int curlx_sltosi(long slnum)
 #endif
 
   DEBUGASSERT(slnum >= 0);
+#if (SIZEOF_INT < CURL_SIZEOF_LONG)
   DEBUGASSERT((unsigned long) slnum <= (unsigned long) CURL_MASK_SINT);
+#endif
   return (int)(slnum & (long) CURL_MASK_SINT);
 
 #ifdef __INTEL_COMPILER
@@ -263,7 +269,9 @@ unsigned int curlx_sltoui(long slnum)
 #endif
 
   DEBUGASSERT(slnum >= 0);
+#if (SIZEOF_INT < CURL_SIZEOF_LONG)
   DEBUGASSERT((unsigned long) slnum <= (unsigned long) CURL_MASK_UINT);
+#endif
   return (unsigned int)(slnum & (long) CURL_MASK_UINT);
 
 #ifdef __INTEL_COMPILER
@@ -341,7 +349,9 @@ int curlx_sztosi(ssize_t sznum)
 #endif
 
   DEBUGASSERT(sznum >= 0);
+#if (SIZEOF_INT < SIZEOF_SIZE_T)
   DEBUGASSERT((size_t) sznum <= (size_t) CURL_MASK_SINT);
+#endif
   return (int)(sznum & (ssize_t) CURL_MASK_SINT);
 
 #ifdef __INTEL_COMPILER