File iax2lib-64bit.diff of Package kiax

Overview Repositories Revisions Requests Users Attributes Meta

File iax2lib-64bit.diff of Package kiax

Index: iaxclient/lib/libiax2/src/iax2-parser.c
===================================================================
--- iaxclient.orig/lib/libiax2/src/iax2-parser.c
+++ iaxclient/lib/libiax2/src/iax2-parser.c
@@ -89,9 +89,9 @@ static void dump_string(char *output, in
 
 static void dump_int(char *output, int maxlen, void *value, int len)
 {
 	if (len == (int)sizeof(unsigned int))
-		snprintf(output, maxlen, "%lu", (unsigned long)ntohl(get_uint32(value)));
+		snprintf(output, maxlen, "%u", (unsigned int)ntohl(get_uint32(value)));
 	else
 		snprintf(output, maxlen, "Invalid INT");
 }
 
@@ -124,9 +124,9 @@ static void dump_ipaddr(char *output, in
 
 static void dump_prov_flags(char *output, int maxlen, void *value, int len)
 {
 	if (len == (int)sizeof(unsigned int))
-		snprintf(output, maxlen, "%lu (%s)", (unsigned long)ntohl(get_uint32(value)),
+		snprintf(output, maxlen, "%u (%s)", (unsigned int)ntohl(get_uint32(value)),
 			"PROVISION_PARSING_NOT_IMPLEMENTED");
 	else
 		snprintf(output, maxlen, "Invalid INT");
 }
@@ -421,10 +421,10 @@ snprintf(tmp, (int)sizeof(tmp), 
 	(rx ? "Rx" : "Tx"),
 	retries, fh->oseqno, fh->iseqno, class, subclass);
 	outputf(tmp);
 snprintf(tmp, (int)sizeof(tmp), 
-"   Timestamp: %05lums  SCall: %5.5d  DCall: %5.5d [%s:%d]\n",
-	(unsigned long)ntohl(fh->ts),
+"   Timestamp: %05ums  SCall: %5.5d  DCall: %5.5d [%s:%d]\n",
+	(unsigned int)ntohl(fh->ts),
 	ntohs(fh->scallno) & ~IAX_FLAG_FULL, ntohs(fh->dcallno) & ~IAX_FLAG_RETRANS,
 		inet_ntoa(sin->sin_addr), ntohs(sin->sin_port));
 	outputf(tmp);
 	if (fh->type == AST_FRAME_IAX)
Index: iaxclient/lib/libiax2/src/md5.h
===================================================================
--- iaxclient.orig/lib/libiax2/src/md5.h
+++ iaxclient/lib/libiax2/src/md5.h
@@ -1,12 +1,9 @@
 #ifndef MD5_H
 #define MD5_H
 
-#ifdef __alpha
-typedef unsigned int uint32;
-#else
-typedef unsigned long uint32;
-#endif
+#include <stdint.h>
+typedef uint32_t uint32;
 
 struct MD5Context {
 	uint32 buf[4];
 	uint32 bits[2];
Index: iaxclient/lib/libiax2/src/iax.c
===================================================================
--- iaxclient.orig/lib/libiax2/src/iax.c
+++ iaxclient/lib/libiax2/src/iax.c
@@ -2085,9 +2085,9 @@ static int display_time(int ms)
 #define FUDGE 1
 
 #ifdef NEWJB
 /* From chan_iax2/steve davies:  need to get permission from steve or digium, I guess */
-static long unwrap_timestamp(long ts, long last)
+static unsigned int unwrap_timestamp(unsigned int ts, unsigned int last)
 {
         int x;
 
         if ( (ts & 0xFFFF0000) == (last & 0xFFFF0000) ) {

Places

File iax2lib-64bit.diff of Package kiax

Places