diff options
| author | Mark Spencer <markster@digium.com> | 2004-12-14 23:36:30 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2004-12-14 23:36:30 +0000 |
| commit | 9d40b8ee8045660d58281553e34b7f45406951c0 (patch) | |
| tree | 48694f38698e4ead3840305333816193c7fcd8a0 /pbx | |
| parent | 0f205bb07903a70272e8ae2403afe20ceb06cedc (diff) | |
Merge slimey's Solaris compatibility (with small mods) (bug #2740)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4446 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx')
| -rwxr-xr-x | pbx/pbx_dundi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c index 0bc2c7996..b68a1050a 100755 --- a/pbx/pbx_dundi.c +++ b/pbx/pbx_dundi.c @@ -39,7 +39,7 @@ #include <sys/socket.h> #include <string.h> #include <errno.h> -#if defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(SOLARIS) #include <sys/types.h> #include <netinet/in_systm.h> #endif @@ -406,7 +406,7 @@ static void reset_global_eid(void) close(s); } #else -#if defined(ifa_broadaddr) +#if defined(ifa_broadaddr) && !defined(SOLARIS) char eid_str[20]; struct ifaddrs *ifap; @@ -4518,14 +4518,14 @@ static int set_config(char *config_file, struct sockaddr_in* sin) tos = IPTOS_THROUGHPUT; else if (!strcasecmp(v->value, "reliability")) tos = IPTOS_RELIABILITY; -#if !defined(__NetBSD__) +#if !defined(__NetBSD__) && !defined(SOLARIS) else if (!strcasecmp(v->value, "mincost")) tos = IPTOS_MINCOST; #endif else if (!strcasecmp(v->value, "none")) tos = 0; else -#if defined(__NetBSD__) +#if defined(__NetBSD__) && !defined(SOLARIS) ast_log(LOG_WARNING, "Invalid tos value at line %d, should be 'lowdelay', 'throughput', 'reliability', 'mincost', or 'none'\n", v->lineno); #else ast_log(LOG_WARNING, "Invalid tos value at line %d, should be 'lowdelay', 'throughput', 'reliability', or 'none'\n", v->lineno); |