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.
2024-10-26 20:25:14 +03:00 · 2017-10-09 00:08:10 +02:00 · 2017-10-09 00:08:10 +02:00 · 45b0ebdc8d
commit 45b0ebdc8d
parent 5b2324b6e0
4 changed files with 2 additions and 10 deletions
--- 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
--- 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

 /**
--- 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>
--- 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