svn commit: samba r25715 - in branches/SAMBA_4_0/source/lib/replace/system: .

metze at samba.org metze at samba.org
Wed Oct 24 12:57:58 GMT 2007


Author: metze
Date: 2007-10-24 12:57:57 +0000 (Wed, 24 Oct 2007)
New Revision: 25715

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25715

Log:
[libreplace] move definition of struct addrinfo so that it can use socklen_t

metze
Modified:
   branches/SAMBA_4_0/source/lib/replace/system/network.h


Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/system/network.h
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/system/network.h	2007-10-24 12:55:40 UTC (rev 25714)
+++ branches/SAMBA_4_0/source/lib/replace/system/network.h	2007-10-24 12:57:57 UTC (rev 25715)
@@ -169,21 +169,6 @@
 #define NI_MAXSERV	32
 #endif
 
-#ifndef HAVE_STRUCT_ADDRINFO
-
-struct addrinfo
-{
-	int			ai_flags;
-	int			ai_family;
-	int			ai_socktype;
-	int			ai_protocol;
-	size_t		ai_addrlen;
-	struct sockaddr *ai_addr;
-	char	   *ai_canonname;
-	struct addrinfo *ai_next;
-};
-#endif   /* HAVE_STRUCT_ADDRINFO */
-
 /*
  * glibc on linux doesn't seem to have MSG_WAITALL
  * defined. I think the kernel has it though..
@@ -234,6 +219,19 @@
 #endif
 #endif
 
+#ifndef HAVE_STRUCT_ADDRINFO
+struct addrinfo {
+	int			ai_flags;
+	int			ai_family;
+	int			ai_socktype;
+	int			ai_protocol;
+	socklen_t		ai_addrlen;
+	struct sockaddr 	*ai_addr;
+	char			*ai_canonname;
+	struct addrinfo		*ai_next;
+};
+#endif   /* HAVE_STRUCT_ADDRINFO */
+
 #ifdef SOCKET_WRAPPER
 #ifndef SOCKET_WRAPPER_NOT_REPLACE
 #define SOCKET_WRAPPER_REPLACE



More information about the samba-cvs mailing list