From 39ae247093f84005a3a82d1be9de59b68387cc74 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 28 Mar 2011 10:34:17 +0000 Subject: solaris11: sal: SIOCGIFHWADDR is defined on Solaris 11, but no ifr_hwaddr: according to [1] SIOCGIFHWADDR would fail at runtime for PF_INET socket anyway, so just disable it on Solaris. [1] http://opensolaris.org/jive/thread.jspa?threadID=116059 --- sal/osl/unx/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sal/osl/unx/util.c b/sal/osl/unx/util.c index 2e97f961a..9949e36f8 100644 --- a/sal/osl/unx/util.c +++ b/sal/osl/unx/util.c @@ -162,7 +162,7 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr) * And now, the real thing: the get address */ -#ifdef SIOCGIFHWADDR +#if defined(SIOCGIFHWADDR) && !defined(SOLARIS) ret=ioctl(so, SIOCGIFHWADDR, &ifr); #else ret=ioctl(so, SIOCGIFADDR, &ifr); @@ -177,7 +177,7 @@ static int osl_getHWAddr(const char *ifname, char* hard_addr) close(so); -#ifdef SIOCGIFHWADDR +#if defined(SIOCGIFHWADDR) && !defined(SOLARIS) memcpy(hard_addr,ifr.ifr_hwaddr.sa_data,8); #else memcpy(hard_addr,ifr.ifr_ifru.ifru_addr.sa_data,8); -- cgit v1.2.3