public inbox for libc-hacker@sourceware.org
 help / color / mirror / Atom feed
* BZ#560: Fix <netinet/in.h>
@ 2004-12-19 14:32 Andreas Jaeger
  2004-12-19 20:23 ` Roland McGrath
  0 siblings, 1 reply; 2+ messages in thread
From: Andreas Jaeger @ 2004-12-19 14:32 UTC (permalink / raw)
  To: Glibc hackers

[-- Attachment #1: Type: text/plain, Size: 2041 bytes --]


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

[-- Attachment #2: Type: application/pgp-signature, Size: 188 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: BZ#560: Fix <netinet/in.h>
  2004-12-19 14:32 BZ#560: Fix <netinet/in.h> Andreas Jaeger
@ 2004-12-19 20:23 ` Roland McGrath
  0 siblings, 0 replies; 2+ messages in thread
From: Roland McGrath @ 2004-12-19 20:23 UTC (permalink / raw)
  To: Andreas Jaeger; +Cc: Glibc hackers

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

Yes, that is fine.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2004-12-19 20:23 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-12-19 14:32 BZ#560: Fix <netinet/in.h> Andreas Jaeger
2004-12-19 20:23 ` Roland McGrath

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).