Revision

17409

Author

jeff

Date

2010-04-26 10:55:46 -0500 (Mon, 26 Apr 2010)

Log Message

Build fixes for windows

Modified Paths

• freeswitch/trunk/src/switch_ivr_originate.c
• freeswitch/trunk/src/switch_rtp.c

Diff

--- freeswitch/trunk/src/switch_ivr_originate.c	2010-04-26 11:02:26 UTC (rev 17408)
+++ freeswitch/trunk/src/switch_ivr_originate.c	2010-04-26 15:55:46 UTC (rev 17409)
@@ -1661,7 +1661,7 @@
 		}
 		
 		if (state->ringback->asis && datalen) {
-			uint16_t flen = datalen;
+			uint16_t flen = (uint16_t)datalen;
 			switch_mutex_lock(state->mutex);
 			switch_buffer_write(state->buffer, &flen, sizeof(uint16_t));
 			switch_buffer_write(state->buffer, read_frame->data, datalen);

--- freeswitch/trunk/src/switch_rtp.c	2010-04-26 11:02:26 UTC (rev 17408)
+++ freeswitch/trunk/src/switch_rtp.c	2010-04-26 15:55:46 UTC (rev 17409)
@@ -2130,7 +2130,7 @@
 								  "Sender Packet Count = %u, " \
 								  "Sender Octet Count = %u\n",
 								  rtp_session->rtcp_recv_msg.header.count,
-								  ntohs(rtp_session->rtcp_recv_msg.header.length),
+								  ntohs((uint16_t)rtp_session->rtcp_recv_msg.header.length),
 								  ntohl(sr->ssrc),
 								  ntohl(sr->ntp_msw),
 								  ntohl(sr->ntp_lsw),
@@ -2907,7 +2907,7 @@
 		rtp_session->rtcp_fresh_frame = 0;
 
 		frame->ssrc = ntohl(sr->ssrc);
-		frame->packet_type = rtp_session->rtcp_recv_msg.header.type;
+		frame->packet_type = (uint16_t)rtp_session->rtcp_recv_msg.header.type;
 		frame->ntp_msw = ntohl(sr->ntp_msw);
 		frame->ntp_lsw = ntohl(sr->ntp_lsw);
 		frame->timestamp = ntohl(sr->ts);
@@ -3337,8 +3337,8 @@
 			struct switch_rtcp_senderinfo* sr = (struct switch_rtcp_senderinfo*)rtp_session->rtcp_send_msg.body;
 
 			sr->ssrc = send_msg->header.ssrc;
-			sr->ntp_msw = htonl(rtp_session->send_time / 1000000 + 2208988800UL);
-			sr->ntp_lsw = htonl(rtp_session->send_time % 1000000 * ((UINT_MAX * 1.0)/ 1000000.0));
+			sr->ntp_msw = htonl((u_long)rtp_session->send_time / 1000000 + 2208988800UL);
+			sr->ntp_lsw = htonl((u_long)(rtp_session->send_time % 1000000 * ((UINT_MAX * 1.0)/ 1000000.0)));
 			sr->ts = send_msg->header.ts;
 			sr->pc = htonl(rtp_session->stats.outbound.packet_count);
 			sr->oc = htonl((rtp_session->stats.outbound.raw_bytes - rtp_session->stats.outbound.packet_count * sizeof(srtp_hdr_t)));