From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 23 Nov 2005 09:10:00 +0000 (+0000)
Subject: Yang Tse fixed MSVC 6.0 warnings
X-Git-Tag: curl-7_15_1~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=599d9642ca92a8f9b6feaef20844c1ef4f41dbcc;p=thirdparty%2Fcurl.git

Yang Tse fixed MSVC 6.0 warnings
---

diff --git a/lib/setup.h b/lib/setup.h
index 5249d2e5f5..ce0fc5075d 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -169,8 +169,10 @@ typedef unsigned char bool;
 #endif
 
 #if defined(ENABLE_IPV6) || defined(USE_SSLEAY)
+#if !defined(_MSC_VER) || (_MSC_VER >= 1300)
 #include <ws2tcpip.h>
 #endif
+#endif
 
 #if !defined(__GNUC__) || defined(__MINGW32__)
 #define sclose(x) closesocket(x)
diff --git a/src/main.c b/src/main.c
index 5686114743..ecc78001da 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1944,7 +1944,7 @@ static ParameterError getparameter(char *flag, /* f or -long-flag */
                    nextarg,
                    &config->httppost,
                    &config->last_post,
-                   subletter=='s')) /* 's' means literal string */
+                   (bool) (subletter=='s'))) /* 's' means literal string */
         return PARAM_BAD_USE;
       if(SetHTTPrequest(config, HTTPREQ_POST, &config->httpreq))
         return PARAM_BAD_USE;