summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2011-04-01 10:23:05 +0200
committerIvo Hinkelmann <ihi@openoffice.org>2011-04-01 10:23:05 +0200
commit293036cbef069d65942929fcdade2726795d1dda (patch)
tree5cfa1e17dbe279559c55c9819f04ae26af4ce191
parent1474a58a63d06c99424ec323f8407ab4acd8fbf0 (diff)
parent39ae247093f84005a3a82d1be9de59b68387cc74 (diff)
CWS-TOOLING: integrate CWS solaris11ooo/DEV300_m106
-rw-r--r--sal/osl/unx/util.c4
1 files 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);