diff options
| author | Raimo Niskanen <[email protected]> | 2011-11-24 18:22:34 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2011-11-29 09:41:36 +0100 |
| commit | 5643ef4f4203734cdc4f6c7fe9898d288d721fb8 (patch) | |
| tree | 29abef0495acf4a7d1d0fc4deeeb6b2a4aebe47a /erts/emulator | |
| parent | 06554482af2de923e8b5c2849f315138cada24e3 (diff) | |
| download | otp-5643ef4f4203734cdc4f6c7fe9898d288d721fb8.tar.gz otp-5643ef4f4203734cdc4f6c7fe9898d288d721fb8.tar.bz2 otp-5643ef4f4203734cdc4f6c7fe9898d288d721fb8.zip | |
Work around gcc linking with own view of default libs on Solaris
Also use 64-bit lib when necessary, specify runtime lib path
for secondary dependency libs, and better check before using
SIOCGIFHWADDR.
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/drivers/common/inet_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c index 455006533e..9dbe66170d 100644 --- a/erts/emulator/drivers/common/inet_drv.c +++ b/erts/emulator/drivers/common/inet_drv.c @@ -4301,7 +4301,7 @@ static int inet_ctl_ifget(inet_descriptor* desc, char* buf, int len, sptr += alen; } } -#elif defined(SIOCGIFHWADDR) +#elif defined(SIOCGIFHWADDR) && defined(HAVE_STRUCT_IFREQ_IFR_HWADDR) if (ioctl(desc->s, SIOCGIFHWADDR, (char *)&ifreq) < 0) break; buf_check(sptr, s_end, 1+2+IFHWADDRLEN); |