Yang Tse fixed MSVC 6.0 warnings

diff --git a/lib/setup.h b/lib/setup.h
index 5249d2e5f57326e6b5e046cd668fa80639e553e4..ce0fc5075dd12b52c4990452745479d133abb182 100644 (file)
--- 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 56861147432896489047752e9dfb3932e15093c6..ecc78001da11ab74a767e6879b8b7e852528c018 100644 (file)
--- 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;