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

[markster at lists.digium.com]

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

Modified Files:
	pbx_dundi.c 
Log Message:
Merge twisted's OSX compat fix (bug #3090)


Index: pbx_dundi.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx/pbx_dundi.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- pbx_dundi.c	14 Dec 2004 23:36:30 -0000	1.20
+++ pbx_dundi.c	19 Dec 2004 17:33:19 -0000	1.21
@@ -39,7 +39,7 @@
 #include <sys/socket.h>
 #include <string.h>
 #include <errno.h>
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(SOLARIS)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(SOLARIS) || defined(__OSX__)
 #include <sys/types.h>
 #include <netinet/in_systm.h>
 #endif
@@ -47,7 +47,7 @@
 #include <sys/ioctl.h>
 #include <netinet/in.h>
 #include <net/if.h>
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OSX__)
 #include <net/if_dl.h>
 #include <ifaddrs.h>
 #endif