svn commit: samba r2626 - in branches/SAMBA_4_0/source/librpc/rpc: .

[tridge at samba.org]

Author: tridge
Date: 2004-09-25 11:19:29 +0000 (Sat, 25 Sep 2004)
New Revision: 2626

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source/librpc/rpc&rev=2626&nolog=1

Log:
the symbol gai_error is defined in /usr/include, so don't use that name in our code





Modified:
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc_tcp.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_tcp.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_tcp.c	2004-09-25 11:18:50 UTC (rev 2625)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_tcp.c	2004-09-25 11:19:29 UTC (rev 2626)
@@ -284,7 +284,7 @@
 				  int family)
 {
 	struct tcp_private *tcp;
-	int fd, gai_error;
+	int fd, gai_err;
 	struct fd_event fde;
 	struct addrinfo hints, *res, *tmpres;
 	char portname[16];
@@ -300,10 +300,10 @@
 
 	snprintf(portname, sizeof(portname)-1, "%d", port);
 	
-	gai_error = getaddrinfo(server, portname, &hints, &res);
-	if (gai_error < 0) 
+	gai_err = getaddrinfo(server, portname, &hints, &res);
+	if (gai_err < 0) 
 	{
-		DEBUG(0, ("Unable to connect to %s:%d : %s\n", server, port, gai_strerror(gai_error)));
+		DEBUG(0, ("Unable to connect to %s:%d : %s\n", server, port, gai_strerror(gai_err)));
 		return NT_STATUS_BAD_NETWORK_NAME;
 	}