]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Build fixes for windows
authorJeff Lenk <jeff@jefflenk.com>
Mon, 26 Apr 2010 15:55:46 +0000 (10:55 -0500)
committerJeff Lenk <jeff@jefflenk.com>
Mon, 26 Apr 2010 15:55:46 +0000 (10:55 -0500)
src/switch_ivr_originate.c
src/switch_rtp.c

index a79f2eb6f30c410c5dc3c590381f941d9fe803a2..750da18c13fcbff35fd920eb6a9cbc10fd363936 100644 (file)
@@ -1661,7 +1661,7 @@ static void *SWITCH_THREAD_FUNC early_thread_run(switch_thread_t *thread, void *
                }
                
                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);
index d1126703e6220d93e7bc6e2ad8b44964acad7d05..b8b5185745ce9cbbf92e95e586d968114b1ab757 100644 (file)
@@ -2130,7 +2130,7 @@ static switch_status_t read_rtcp_packet(switch_rtp_t *rtp_session, switch_size_t
                                                                  "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 @@ SWITCH_DECLARE(switch_status_t) switch_rtcp_zerocopy_read_frame(switch_rtp_t *rt
                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 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
                        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)));