silence compiler warnings for mingw win32 builds --enable-debug

diff --git a/lib/connect.c b/lib/connect.c
index 261ab08d843a608dc0b3ceb2ac9e4e7944bac8dc..f402ede77f9dc345d6e9e560c6429e2f50093dbf 100644 (file)
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -364,6 +364,9 @@ static CURLcode bindlocal(struct connectdata *conn,
     return CURLE_OK;
 
   } /* end of device selection support */
+#else
+  (void)conn;
+  (void)sockfd;
 #endif /* end of HAVE_INET_NTOA */
 
   return CURLE_HTTP_PORT_FAILED;

diff --git a/lib/ftp.c b/lib/ftp.c
index 8ad00d440403f787fef85b5aa96e52bbf52a8716..526ff56ae34c7cd6c11f1386ac04c58d8f9ca1e9 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -1062,7 +1062,7 @@ static CURLcode ftp_state_use_port(struct connectdata *conn,
       /* we set the secondary socket variable to this for now, it
          is only so that the cleanup function will close it in case
          we fail before the true secondary stuff is made */
-      if(-1 != conn->sock[SECONDARYSOCKET])
+      if(CURL_SOCKET_BAD != conn->sock[SECONDARYSOCKET])
         sclose(conn->sock[SECONDARYSOCKET]);
       conn->sock[SECONDARYSOCKET] = portsock;
 

diff --git a/lib/if2ip.h b/lib/if2ip.h
index 45a1805319715730d7ba25c24518c868d9b54622..ddb73ee8b86847d0d8635d967dfa166866dfbedd 100644 (file)
--- a/lib/if2ip.h
+++ b/lib/if2ip.h
@@ -24,12 +24,8 @@
  ***************************************************************************/
 #include "setup.h"
 
-#if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN32__) && \
-    !defined(__riscos__) && !defined(__INTERIX)
-extern char *Curl_if2ip(const char *interface, char *buf, int buf_size);
-#else
-#define Curl_if2ip(a,b,c) NULL
-#endif
+extern char *Curl_if2ip(const char *interf, char *buf, int buf_size);
+
 #ifdef __INTERIX
 /* Nedelcho Stanev's work-around for SFU 3.0 */
 struct ifreq {

diff --git a/lib/strerror.c b/lib/strerror.c
index 0f0c0fff2757be30b74a8221460667cf25de8589..85baa635da5d523f9835e9eb0e558bd6304dd6b2 100644 (file)
--- a/lib/strerror.c
+++ b/lib/strerror.c
@@ -346,7 +346,7 @@ curl_share_strerror(CURLSHcode error)
 static const char *
 get_winsock_error (int err, char *buf, size_t len)
 {
-  char *p;
+  const char *p;
 
 #ifndef CURL_DISABLE_VERBOSE_STRINGS
   switch (err) {