[Glibc-bsd-commits] r2778 - in trunk/kfreebsd-kernel-headers/debian: . patches

[Petr Salinger]

Author: ps-guest
Date: 2009-09-04 13:14:45 +0000 (Fri, 04 Sep 2009)
New Revision: 2778

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
Log:
allow inclusion of <net/if_var.h>, <ifaddrs.h> in both orders



Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2009-09-04 12:02:07 UTC (rev 2777)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2009-09-04 13:14:45 UTC (rev 2778)
@@ -1,6 +1,8 @@
 kfreebsd-kernel-headers (0.41) UNSTABLE; urgency=low
 
+  [ Petr Salinger ]
   * fix <sys/devicestat.h>, needed by icecc
+  * allow inclusion of <net/if_var.h>, <ifaddrs.h> in both orders
 
  -- Aurelien Jarno <aurel32 at debian.org>  Mon, 31 Aug 2009 14:43:56 +0200
 

Modified: trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff	2009-09-04 12:02:07 UTC (rev 2777)
+++ trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff	2009-09-04 13:14:45 UTC (rev 2778)
@@ -47,6 +47,28 @@
  /*
   * Structures defining a network interface, providing a packet
   * transport mechanism (ala level 0 of the PUP protocols).
+@@ -560,8 +560,19 @@
+  */
+ struct ifaddr {
+ 	struct	sockaddr *ifa_addr;	/* address of interface */
+-	struct	sockaddr *ifa_dstaddr;	/* other end of p-to-p link */
+-#define	ifa_broadaddr	ifa_dstaddr	/* broadcast address interface */
++	union
++	{
++	struct  sockaddr *ifu_broadaddr /* broadcast address interface */
++	struct	sockaddr *ifu_dstaddr;	/* other end of p-to-p link */
++	} ifa_ifu;
++/* These very same macros are defined by <ifaddrs.h> for `struct ifaddrs'.
++   So if they are defined already, the existing definitions will be fine.  */
++# ifndef ifa_broadaddr
++#  define ifa_broadaddr ifa_ifu.ifu_broadaddr
++# endif
++# ifndef ifa_dstaddr
++#  define ifa_dstaddr   ifa_ifu.ifu_dstaddr
++# endif
+ 	struct	sockaddr *ifa_netmask;	/* used to determine subnet */
+ 	struct	if_data if_data;	/* not all members are meaningful */
+ 	struct	ifnet *ifa_ifp;		/* back-pointer to interface */
 diff -ur sys.orig/netinet/in_var.h sys/netinet/in_var.h
 --- src/sys.orig/netinet/in_var.h	2004-08-16 20:32:07.000000000 +0200
 +++ src/sys/netinet/in_var.h	2004-11-30 01:16:42.000000000 +0100