diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-12-10 16:28:14 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-12-10 16:28:14 +0000 |
| commit | 1b0df8c30f929fe8f51236dcced49ffb40320e8d (patch) | |
| tree | bc081b139366405d4a54f5dd956840dbbe50f8c2 /main/netsock.c | |
| parent | 30f81f902d72e077dbc4e4367669012251ab40d7 (diff) | |
Merged revisions 298051 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r298051 | tilghman | 2010-12-10 10:26:46 -0600 (Fri, 10 Dec 2010) | 18 lines
Merged revisions 298050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r298050 | tilghman | 2010-12-10 10:24:13 -0600 (Fri, 10 Dec 2010) | 11 lines
Portability issue on OpenSolaris.
Also detect the required structure element, because OpenSolaris defines
SIOCGIFHWADDR, but without support for IP sockets.
(closes issue #18442)
Reported by: ranjtech
Patches:
20101209__issue18442.diff.txt uploaded by tilghman (license 14)
Tested by: ranjtech
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@298052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/netsock.c')
| -rw-r--r-- | main/netsock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/netsock.c b/main/netsock.c index b6dfc6e9c..5cab1c19a 100644 --- a/main/netsock.c +++ b/main/netsock.c @@ -236,7 +236,7 @@ char *ast_eid_to_str(char *s, int maxlen, struct ast_eid *eid) void ast_set_default_eid(struct ast_eid *eid) { -#if defined(SIOCGIFHWADDR) +#if defined(SIOCGIFHWADDR) && defined(HAVE_STRUCT_IFREQ_IFR_IFRU_IFRU_HWADDR) int s, x = 0; char eid_str[20]; struct ifreq ifr; |