[Asterisk-cvs] asterisk/pbx pbx_dundi.c,1.19,1.20

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/pbx
In directory mongoose.digium.com:/tmp/cvs-serv25047/pbx

Modified Files:
	pbx_dundi.c 
Log Message:
Merge slimey's Solaris compatibility (with small mods) (bug #2740)


Index: pbx_dundi.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx/pbx_dundi.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- pbx_dundi.c	11 Nov 2004 14:40:14 -0000	1.19
+++ pbx_dundi.c	14 Dec 2004 23:36:30 -0000	1.20
@@ -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 @@
 		close(s);
 	}
 #else
-#if defined(ifa_broadaddr)
+#if defined(ifa_broadaddr) && !defined(SOLARIS)
 	char eid_str[20];
 	struct ifaddrs *ifap;
 	
@@ -4518,14 +4518,14 @@
 				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);