From: Yang Tse <yangsita@gmail.com>
Date: Mon, 31 May 2010 14:36:05 +0000 (+0200)
Subject: fix compiler warning: enumerated type mixed with another type
X-Git-Tag: curl-7_21_0~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a9483b1f4acf80859f252832ec69a21b683556a3;p=thirdparty%2Fcurl.git

fix compiler warning: enumerated type mixed with another type
---

diff --git a/lib/socks.c b/lib/socks.c
index a10a991861..7b5740be42 100644
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -603,9 +603,9 @@ CURLcode Curl_SOCKS5(const char *proxy_name,
 
     if(rc == CURLRESOLV_PENDING) {
       /* this requires that we're in "wait for resolve" state */
-      rc = Curl_wait_for_resolv(conn, &dns);
-      if(rc)
-        return rc;
+      code = Curl_wait_for_resolv(conn, &dns);
+      if(code != CURLE_OK)
+        return code;
     }
 
     /*