commit c284c64ff9bb42be244193f959210154a0cfa518
author Daniel Veillard <veillard@src.gnome.org> Thu Mar 31 10:24:24 2005 +0000
committer Daniel Veillard <veillard@src.gnome.org> Thu Mar 31 10:24:24 2005 +0000
tree fec6a801d66e41c21957f74f48e53d4e8cb2c90e
parent 394902e0d2803055507c48dfc8c4b7d26f371d55

use XML_SOCKLEN_T instead of SOCKLEN_T since apparently IBM can't avoid

* config.h.in configure.in nanoftp.c nanohttp.c xmllint.c
  macos/src/config-mac.h: use XML_SOCKLEN_T instead of SOCKLEN_T
  since apparently IBM can't avoid breaking common defines #166922
Daniel

nanohttp.c

diff --git a/nanohttp.c b/nanohttp.c
index ef88fd0..bc70ac7 100644
--- a/nanohttp.c
+++ b/nanohttp.c
@@ -69,7 +69,7 @@
 
 #ifdef VMS
 #include <stropts>
-#define SOCKLEN_T unsigned int
+#define XML_SOCKLEN_T unsigned int
 #define SOCKET int
 #endif
 
@@ -78,8 +78,8 @@
 #define _WINSOCKAPI_
 #include <wsockcompat.h>
 #include <winsock2.h>
-#undef SOCKLEN_T
-#define SOCKLEN_T unsigned int
+#undef XML_SOCKLEN_T
+#define XML_SOCKLEN_T unsigned int
 #endif
 
 
@@ -107,8 +107,8 @@
 #endif
 #endif
 
-#ifndef SOCKLEN_T
-#define SOCKLEN_T unsigned int
+#ifndef XML_SOCKLEN_T
+#define XML_SOCKLEN_T unsigned int
 #endif
 #ifndef SOCKET
 #define SOCKET int
@@ -861,7 +861,7 @@
                            || FD_ISSET(s, &xfd)
 #endif
                                                 ) {
-	SOCKLEN_T len;
+	XML_SOCKLEN_T len;
 	len = sizeof(status);
 #ifdef SO_ERROR
 	if (getsockopt(s, SOL_SOCKET, SO_ERROR, (char*)&status, &len) < 0 ) {