Index: configure
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: channels/chan_sip.c
===================================================================
--- channels/chan_sip.c	(revision 214199)
+++ channels/chan_sip.c	(working copy)
@@ -6574,8 +6574,13 @@
 
 		sip_pvt_unlock(i);
 		/* Don't hold a sip pvt lock while we allocate a channel */
-		tmp = ast_channel_alloc(1, state, i->cid_num, i->cid_name, i->accountcode, i->exten, i->context, linkedid, i->amaflags, "SIP/%s-%08x", my_name, (int)(long) i);
-
+		tmp = ast_channel_alloc(1, state, i->cid_num, i->cid_name, i->accountcode, i->exten, i->context, linkedid, i->amaflags,
+#if SIZEOF_CHAR_P == 8
+			"SIP/%s-%016lx", my_name, (long) i
+#else
+			"SIP/%s-%08x", my_name, (int)(long) i
+#endif
+		);
 	}
 	if (!tmp) {
 		ast_log(LOG_WARNING, "Unable to allocate AST channel structure for SIP channel\n");
Index: configure.ac
===================================================================
--- configure.ac	(revision 214152)
+++ configure.ac	(working copy)
@@ -665,6 +665,8 @@
 
 AC_CHECK_SIZEOF(int)
 
+AC_CHECK_SIZEOF(char *)
+
 # do the package library checks now
 
 AST_EXT_LIB_CHECK([ALSA], [asound], [snd_spcm_init], [alsa/asoundlib.h], [-lm -ldl])
Index: include/asterisk/autoconfig.h.in
===================================================================
--- include/asterisk/autoconfig.h.in	(revision 214152)
+++ include/asterisk/autoconfig.h.in	(working copy)
@@ -1316,6 +1316,9 @@
    release 3. */
 #undef SETVBUF_REVERSED
 
+/* The size of `char *', as computed by sizeof. */
+#undef SIZEOF_CHAR_P
+
 /* The size of `int', as computed by sizeof. */
 #undef SIZEOF_INT