diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2011-04-01 10:23:05 +0200 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2011-04-01 10:23:05 +0200 |
| commit | 013fa416d39f1c219722e6736b7234f944fe774f (patch) | |
| tree | b2dacf608a66967d3122a0ff242881cd1c088137 | |
| parent | a75058e893ae734a3c648db891ea281e04a97fcd (diff) | |
| parent | 8a7919cc5690b08d403775607210398c67251172 (diff) | |
CWS-TOOLING: integrate CWS solaris11
Notes
split repo tag: ure_ooo/DEV300_m106
| -rw-r--r-- | sal/osl/unx/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sal/osl/unx/util.c b/sal/osl/unx/util.c index 5ba04db56021..4a3f748c85bf 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); |