[Asterisk-cvs] asterisk/channels chan_zap.c, 1.417, 1.418 iax2-parser.c, 1.37, 1.38

[markster at lists.digium.com]

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

Modified Files:
	chan_zap.c iax2-parser.c 
Log Message:
Add support for Solaris/x86 (bug #3064)


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -d -r1.417 -r1.418
--- chan_zap.c	11 Mar 2005 17:13:03 -0000	1.417
+++ chan_zap.c	17 Mar 2005 23:12:15 -0000	1.418
@@ -1055,7 +1055,7 @@
 }
 #endif
 
-static char *sig2str(int sig)
+static char *zap_sig2str(int sig)
 {
 	static char buf[256];
 	switch(sig) {
@@ -1111,6 +1111,8 @@
 	}
 }
 
+#define sig2str zap_sig2str
+
 static int conf_add(struct zt_pvt *p, struct zt_subchannel *c, int index, int slavechannel)
 {
 	/* If the conference already exists, and we're already in it

Index: iax2-parser.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/iax2-parser.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- iax2-parser.c	28 Feb 2005 06:06:42 -0000	1.37
+++ iax2-parser.c	17 Mar 2005 23:12:15 -0000	1.38
@@ -30,7 +30,7 @@
 static int iframes = 0;
 static int oframes = 0;
 
-#ifdef SOLARIS
+#if defined(SOLARIS) && defined(__sparc__)
 static unsigned int get_uint32(unsigned char *p)
 {
   return (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];