aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/setup.h2
-rw-r--r--src/main.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/setup.h b/lib/setup.h
index 5249d2e5f..ce0fc5075 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 568611474..ecc78001d 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;