[Asterisk-cvs] asterisk Makefile,1.41,1.42 enum.c,1.11,1.12 srv.c,1.5,1.6

[markster at lists.digium.com]

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

Modified Files:
	Makefile enum.c srv.c 
Log Message:
More cleanups and OSX fixes for 10.3


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- Makefile	26 Oct 2003 18:50:48 -0000	1.41
+++ Makefile	27 Oct 2003 20:00:40 -0000	1.42
@@ -151,6 +151,11 @@
 ifeq (${OSARCH},Linux)
 LIBS+=-lresolv  #-lnjamd
 endif
+ifeq (${OSARCH},Darwin)
+ifeq ($(shell uname -r),7.0.0)
+LIBS+=-lresolv
+endif
+endif
 OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
 	translate.o file.o say.o pbx.o cli.o md5.o term.o \
 	ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \

Index: enum.c
===================================================================
RCS file: /usr/cvsroot/asterisk/enum.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- enum.c	26 Oct 2003 18:50:48 -0000	1.11
+++ enum.c	27 Oct 2003 20:00:41 -0000	1.12
@@ -15,6 +15,9 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
+#if __APPLE_CC__ >= 1495
+#include <arpa/nameser_compat.h>
+#endif
 #include <resolv.h>
 #include <stdlib.h>
 #include <string.h>

Index: srv.c
===================================================================
RCS file: /usr/cvsroot/asterisk/srv.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- srv.c	26 Oct 2003 18:50:48 -0000	1.5
+++ srv.c	27 Oct 2003 20:00:41 -0000	1.6
@@ -14,6 +14,9 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/nameser.h>
+#if __APPLE_CC__ >= 1495
+#include <arpa/nameser_compat.h>
+#endif
 #include <resolv.h>
 #include <stdio.h>
 #include <string.h>
@@ -35,22 +38,6 @@
 	unsigned short weight;
 	unsigned short portnum;
 } __attribute__ ((__packed__));
-
-static int parse_ie(unsigned char *data, int maxdatalen, unsigned char *src, int srclen)
-{
-	int len, olen;
-	len = olen = (int)src[0];
-	src++;
-	srclen--;
-	if (len > srclen) {
-		ast_log(LOG_WARNING, "Want %d, got %d\n", len, srclen);
-		return -1;
-	}
-	if (len > maxdatalen)
-		len = maxdatalen;
-	memcpy(data, src, len);
-	return olen + 1;
-}
 
 static int parse_srv(unsigned char *host, int hostlen, int *portno, unsigned char *answer, int len, unsigned char *msg)
 {