socklen_t is always int on Windows

Define XML_SOCKLEN_T as `int` unconditionally in wsockcompat.h. Fixes compiler warnings and removes some duplicated code.
jorgo512 · Oct 9, 2017 · 45b0ebd · 45b0ebd
1 parent 5b2324b
commit 45b0ebd
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/include/wsockcompat.h b/include/wsockcompat.h
@@ -27,10 +27,8 @@
 #endif
 #endif
 
-#if !defined SOCKLEN_T
-#define SOCKLEN_T int
-#endif
-
+#undef XML_SOCKLEN_T
+#define XML_SOCKLEN_T int
 
 #ifndef ECONNRESET
 #define ECONNRESET WSAECONNRESET

diff --git a/nanoftp.c b/nanoftp.c
@@ -83,8 +83,6 @@
 #endif
 #include <wsockcompat.h>
 #include <winsock2.h>
-#undef XML_SOCKLEN_T
-#define XML_SOCKLEN_T unsigned int
 #endif
 
 /**

diff --git a/nanohttp.c b/nanohttp.c
@@ -80,8 +80,6 @@
 #endif
 #include <wsockcompat.h>
 #include <winsock2.h>
-#undef XML_SOCKLEN_T
-#define XML_SOCKLEN_T unsigned int
 #endif
 
 #include <libxml/globals.h>

diff --git a/xmllint.c b/xmllint.c
@@ -31,8 +31,6 @@
 #define _WINSOCKAPI_
 #include <wsockcompat.h>
 #include <winsock2.h>
-#undef XML_SOCKLEN_T
-#define XML_SOCKLEN_T unsigned int
 #endif
 
 #ifdef HAVE_SYS_TIMEB_H