[Asterisk-cvs] asterisk mkpkgconfig, 1.3, 1.4 rtp.c, 1.113, 1.114 strcompat.c, 1.1, 1.2 utils.c, 1.35, 1.36

[markster at lists.digium.com]

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

Modified Files:
	mkpkgconfig rtp.c strcompat.c utils.c 
Log Message:
Add support for Solaris/x86 (bug #3064)


Index: mkpkgconfig
===================================================================
RCS file: /usr/cvsroot/asterisk/mkpkgconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mkpkgconfig	14 Dec 2004 23:36:29 -0000	1.3
+++ mkpkgconfig	17 Mar 2005 23:12:15 -0000	1.4
@@ -15,12 +15,12 @@
 
 ## Clean out CFLAGS for the spec file.
 
-LOCAL_CFLAGS=$(echo $CFLAGS | sed -e 's/\s*-pipe\s*//g' | sed -e 's/-[Wmp]\S*\s*//g' | \
-  sed -r -e 's/-I(include|\.\.\/include) //g' |
-  sed -e 's/-DINSTALL_PREFIX=\S* //g' |
-  sed -r -e 's/-DASTERISK_VERSION=\S* //g' |
-  sed -r -e 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g'
-)
+LOCAL_CFLAGS=`echo $CFLAGS | sed -e 's/\s*-pipe\s*//g' | sed -e 's/-[Wmp]\S*\s*//g' | \
+  sed -r -e 's/-I(include|\.\.\/include) //g' | \
+  sed -e 's/-DINSTALL_PREFIX=\S* //g' | \
+  sed -r -e 's/-DASTERISK_VERSION=\S* //g' | \
+  sed -r -e 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g'`
+
 
 cat <<EOF > $PPATH/asterisk.pc
 install_prefix=$INSTALL_PREFIX

Index: rtp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/rtp.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- rtp.c	5 Mar 2005 20:57:49 -0000	1.113
+++ rtp.c	17 Mar 2005 23:12:15 -0000	1.114
@@ -1170,11 +1170,9 @@
 	return 0;
 }
 
-#ifdef SOLARIS
+#if defined(SOLARIS) && defined(__sparc__)
 static void put_uint32(unsigned char *buf, int i)
 {
-	unsigned char *c = (unsigned char *)&i;
-
 	buf[0] = (i>>24) & 0xff;
 	buf[1] = (i>>16) & 0xff;
 	buf[2] = (i>>8)  & 0xff;

Index: strcompat.c
===================================================================
RCS file: /usr/cvsroot/asterisk/strcompat.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- strcompat.c	14 Dec 2004 23:36:29 -0000	1.1
+++ strcompat.c	17 Mar 2005 23:12:15 -0000	1.2
@@ -2,6 +2,9 @@
 
 #include <sys/types.h>
 #include <stdio.h>
+#ifdef SOLARIS
+#include <solaris-compat/compat.h>
+#endif
 
 char* strsep(char** str, const char* delims)
 {
@@ -142,3 +145,9 @@
 
 	return ret;
 }
+
+int unsetenv(const char *name)
+{
+  setenv(name,"",0);
+}
+

Index: utils.c
===================================================================
RCS file: /usr/cvsroot/asterisk/utils.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- utils.c	8 Mar 2005 20:47:30 -0000	1.35
+++ utils.c	17 Mar 2005 23:12:15 -0000	1.36
@@ -164,6 +164,7 @@
 	   integers, we break with tradition and refuse to look up a
 	   pure integer */
 	s = host;
+	res = 0;
 	while(s && *s) {
 		if (!isdigit(*s))
 			break;