Module Name: src
Committed By: christos
Date: Tue Dec 2 22:13:13 UTC 2014
Modified Files:
src/external/bsd/dhcpcd/dist: if.c
Log Message:
avoid macro clash.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/dhcpcd/dist/if.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/dist/if.c
diff -u src/external/bsd/dhcpcd/dist/if.c:1.7 src/external/bsd/dhcpcd/dist/if.c:1.8
--- src/external/bsd/dhcpcd/dist/if.c:1.7 Wed Nov 26 08:43:06 2014
+++ src/external/bsd/dhcpcd/dist/if.c Tue Dec 2 17:13:13 2014
@@ -1,5 +1,5 @@
#include <sys/cdefs.h>
- __RCSID("$NetBSD: if.c,v 1.7 2014/11/26 13:43:06 roy Exp $");
+ __RCSID("$NetBSD: if.c,v 1.8 2014/12/02 22:13:13 christos Exp $");
/*
* dhcpcd - DHCP client daemon
@@ -187,7 +187,7 @@ if_discover(struct dhcpcd_ctx *ctx, int
struct ifaddrs *ifaddrs, *ifa;
char *p;
int i;
- sa_family_t sdl_type;
+ sa_family_t sdltype;
struct if_head *ifs;
struct interface *ifp;
#ifdef __linux__
@@ -321,7 +321,7 @@ if_discover(struct dhcpcd_ctx *ctx, int
ifp->flags = ifa->ifa_flags;
ifp->carrier = if_carrier(ifp);
- sdl_type = 0;
+ sdltype = 0;
if (ifa->ifa_addr != NULL) {
#ifdef AF_LINK
sdl = (const struct sockaddr_dl *)(void *)ifa->ifa_addr;
@@ -346,7 +346,7 @@ if_discover(struct dhcpcd_ctx *ctx, int
memcpy(&ifp->linkaddr, sdl, sdl->sdl_len);
#endif
ifp->index = sdl->sdl_index;
- sdl_type = sdl->sdl_type;
+ sdltype = sdl->sdl_type;
switch(sdl->sdl_type) {
#ifdef IFT_BRIDGE
case IFT_BRIDGE:
@@ -388,7 +388,7 @@ if_discover(struct dhcpcd_ctx *ctx, int
#elif AF_PACKET
sll = (const struct sockaddr_ll *)(void *)ifa->ifa_addr;
ifp->index = (unsigned int)sll->sll_ifindex;
- ifp->family = sdl_type = sll->sll_hatype;
+ ifp->family = sdltype = sll->sll_hatype;
ifp->hwlen = sll->sll_halen;
if (ifp->hwlen != 0)
memcpy(ifp->hwaddr, sll->sll_addr, ifp->hwlen);
@@ -423,7 +423,7 @@ if_discover(struct dhcpcd_ctx *ctx, int
syslog(LOG_WARNING,
"%s: unsupported interface type %.2x, "
"family %.2x",
- ifp->name, sdl_type, ifp->family);
+ ifp->name, sdltype, ifp->family);
break;
}
}
