BZ#560: Fix <netinet/in.h>

[Andreas Jaeger]

ICC reserves __interface and therefore has problems including
<netinet/in.h> .  I suggest the appended patch.

Ok to commit?

Andreas

2004-12-19  Andreas Jaeger  <aj@suse.de>

	[BZ #560]
	* inet/netinet/in.h: Use __interface_addr instead of __interface.

============================================================
Index: inet/netinet/in.h
--- inet/netinet/in.h	7 Aug 2004 18:21:41 -0000	1.52
+++ inet/netinet/in.h	19 Dec 2004 14:31:25 -0000
@@ -479,13 +479,13 @@ extern int inet6_option_find (__const st
 /* Multicast source filter support.  */
 
 /* Get IPv4 source filter.  */
-extern int getipv4sourcefilter (int __s, struct in_addr __interface,
+extern int getipv4sourcefilter (int __s, struct in_addr __interface_addr,
 				struct in_addr __group, uint32_t *__fmode,
 				uint32_t *__numsrc, struct in_addr *__slist)
      __THROW;
 
 /* Set IPv4 source filter.  */
-extern int setipv4sourcefilter (int __s, struct in_addr __interface,
+extern int setipv4sourcefilter (int __s, struct in_addr __interface_addr,
 				struct in_addr __group, uint32_t __fmode,
 				uint32_t __numsrc,
 				__const struct in_addr *__slist)
@@ -493,14 +493,14 @@ extern int setipv4sourcefilter (int __s,
 
 
 /* Get source filter.  */
-extern int getsourcefilter (int __s, uint32_t __interface,
+extern int getsourcefilter (int __s, uint32_t __interface_addr,
 			    __const struct sockaddr *__group,
 			    socklen_t __grouplen, uint32_t *__fmode,
 			    uint32_t *__numsrc,
 			    struct sockaddr_storage *__slist) __THROW;
 
 /* Set source filter.  */
-extern int setsourcefilter (int __s, uint32_t __interface,
+extern int setsourcefilter (int __s, uint32_t __interface_addr,
 			    __const struct sockaddr *__group,
 			    socklen_t __grouplen, uint32_t __fmode,
 			    uint32_t __numsrc,

-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj
  SUSE Linux Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
   GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 188 bytes
Desc: not available
URL: <http://sourceware.org/pipermail/libc-hacker/attachments/20041219/14e6b182/attachment.sig>