Index: asterisk.c
===================================================================
RCS file: /usr/cvsroot/asterisk/asterisk.c,v
retrieving revision 1.152
diff -u -r1.152 asterisk.c
--- asterisk.c	8 May 2005 16:44:25 -0000	1.152
+++ asterisk.c	11 May 2005 12:51:53 -0000
@@ -327,7 +327,7 @@
 {
 	struct sockaddr_un sunaddr;
 	int s;
-	int len;
+	socklen_t len;
 	int x;
 	int flags;
 	struct pollfd fds[1];
Index: dsp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/dsp.c,v
retrieving revision 1.40
diff -u -r1.40 dsp.c
--- dsp.c	22 Apr 2005 13:11:34 -0000	1.40
+++ dsp.c	11 May 2005 12:51:53 -0000
@@ -1303,7 +1303,7 @@
 	int res;
 	int digit;
 	int x;
-	unsigned short *shortdata;
+	short *shortdata;
 	unsigned char *odata;
 	int len;
 	int writeback = 0;
@@ -1315,11 +1315,11 @@
 				break; \
 			case AST_FORMAT_ULAW: \
 				for (x=0;x<len;x++) \
-					odata[x] = AST_LIN2MU(shortdata[x]); \
+					odata[x] = AST_LIN2MU((unsigned short)shortdata[x]); \
 				break; \
 			case AST_FORMAT_ALAW: \
 				for (x=0;x<len;x++) \
-					odata[x] = AST_LIN2A(shortdata[x]); \
+					odata[x] = AST_LIN2A((unsigned short)shortdata[x]); \
 				break; \
 			} \
 		} \
Index: manager.c
===================================================================
RCS file: /usr/cvsroot/asterisk/manager.c,v
retrieving revision 1.94
diff -u -r1.94 manager.c
--- manager.c	29 Apr 2005 17:00:33 -0000	1.94
+++ manager.c	11 May 2005 12:51:53 -0000
@@ -1354,7 +1354,7 @@
 {
 	int as;
 	struct sockaddr_in sin;
-	int sinlen;
+	socklen_t sinlen;
 	struct mansession *s;
 	struct protoent *p;
 	int arg = 1;
Index: rtp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/rtp.c,v
retrieving revision 1.125
diff -u -r1.125 rtp.c
--- rtp.c	4 May 2005 04:43:30 -0000	1.125
+++ rtp.c	11 May 2005 12:51:53 -0000
@@ -355,7 +355,7 @@
 struct ast_frame *ast_rtcp_read(struct ast_rtp *rtp)
 {
 	static struct ast_frame null_frame = { AST_FRAME_NULL, };
-	int len;
+	socklen_t len;
 	int hdrlen = 8;
 	int res;
 	struct sockaddr_in sin;
@@ -424,7 +424,7 @@
 {
 	int res;
 	struct sockaddr_in sin;
-	int len;
+	socklen_t len;
 	unsigned int seqno;
 	int version;
 	int payloadtype;
Index: channels/chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.278
diff -u -r1.278 chan_iax2.c
--- channels/chan_iax2.c	4 May 2005 04:49:32 -0000	1.278
+++ channels/chan_iax2.c	11 May 2005 12:51:54 -0000
@@ -6103,7 +6103,7 @@
 	int updatehistory=1;
 	int new = NEW_PREVENT;
 	char buf[4096], *ptr;
-	int len = sizeof(sin);
+	socklen_t len = sizeof(sin);
 	int dcallno = 0;
 	struct ast_iax2_full_hdr *fh = (struct ast_iax2_full_hdr *)buf;
 	struct ast_iax2_mini_hdr *mh = (struct ast_iax2_mini_hdr *)buf;
Index: channels/chan_mgcp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_mgcp.c,v
retrieving revision 1.120
diff -u -r1.120 chan_mgcp.c
--- channels/chan_mgcp.c	8 May 2005 16:44:25 -0000	1.120
+++ channels/chan_mgcp.c	11 May 2005 12:51:54 -0000
@@ -297,7 +297,7 @@
 	unsigned int seqno;
 	int len;
 	struct mgcp_message *next;
-	unsigned char buf[0];
+	char buf[0];
 };
 
 #define RESPONSE_TIMEOUT 30	/* in seconds */
@@ -307,7 +307,7 @@
 	int len;
 	int seqno;
 	struct mgcp_response *next;
-	unsigned char buf[0];
+	char buf[0];
 };
 
 #define MAX_SUBS 2
@@ -722,7 +722,7 @@
 
 /* SC: modified for the new transaction mechanism */
 static int mgcp_postrequest(struct mgcp_endpoint *p, struct mgcp_subchannel *sub, 
-                            unsigned char *data, int len, unsigned int seqno)
+                            char *data, int len, unsigned int seqno)
 {
 	struct mgcp_message *msg = malloc(sizeof(struct mgcp_message) + len);
 	struct mgcp_message *cur;
@@ -3286,7 +3286,7 @@
 	struct sockaddr_in sin;
 	struct mgcp_subchannel *sub;
 	int res;
-	int len;
+	socklen_t len;
 	int result;
 	int ident;
 	char iabuf[INET_ADDRSTRLEN];
Index: channels/chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.728
diff -u -r1.728 chan_sip.c
--- channels/chan_sip.c	8 May 2005 16:49:28 -0000	1.728
+++ channels/chan_sip.c	11 May 2005 12:51:54 -0000
@@ -1230,7 +1230,7 @@
 /*--- register_peer_exten: Automatically add peer extension to dial plan ---*/
 static void register_peer_exten(struct sip_peer *peer, int onoff)
 {
-	unsigned char multi[256]="";
+	char multi[256]="";
 	char *stringp, *ext;
 	if (!ast_strlen_zero(regcontext)) {
 		ast_copy_string(multi, ast_strlen_zero(peer->regexten) ? peer->name : peer->regexten, sizeof(multi));
@@ -9220,7 +9220,7 @@
 	struct sockaddr_in sin = { 0, };
 	struct sip_pvt *p;
 	int res;
-	int len;
+	socklen_t len;
 	int nounlock;
 	int recount = 0;
 	int debug;
Index: channels/chan_skinny.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_skinny.c,v
retrieving revision 1.72
diff -u -r1.72 chan_skinny.c
--- channels/chan_skinny.c	29 Apr 2005 17:00:33 -0000	1.72
+++ channels/chan_skinny.c	11 May 2005 12:51:54 -0000
@@ -2688,7 +2688,7 @@
 {
 	int as;
 	struct sockaddr_in sin;
-	int sinlen;
+	socklen_t sinlen;
 	struct skinnysession *s;
 	struct protoent *p;
 	int arg = 1;