<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][17409] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=17409">17409</a></dd>
<dt>Author</dt> <dd>jeff</dd>
<dt>Date</dt> <dd>2010-04-26 10:55:46 -0500 (Mon, 26 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Build fixes for windows</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcswitch_ivr_originatec">freeswitch/trunk/src/switch_ivr_originate.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_rtpc">freeswitch/trunk/src/switch_rtp.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcswitch_ivr_originatec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_originate.c (17408 => 17409)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1661,7 +1661,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (state->ringback->asis && datalen) {
</span><del>- uint16_t flen = datalen;
</del><ins>+ uint16_t flen = (uint16_t)datalen;
</ins><span class="cx"> switch_mutex_lock(state->mutex);
</span><span class="cx"> switch_buffer_write(state->buffer, &flen, sizeof(uint16_t));
</span><span class="cx"> switch_buffer_write(state->buffer, read_frame->data, datalen);
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_rtpc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_rtp.c (17408 => 17409)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2130,7 +2130,7 @@
</span><span class="cx"> "Sender Packet Count = %u, " \
</span><span class="cx"> "Sender Octet Count = %u\n",
</span><span class="cx"> rtp_session->rtcp_recv_msg.header.count,
</span><del>- ntohs(rtp_session->rtcp_recv_msg.header.length),
</del><ins>+ ntohs((uint16_t)rtp_session->rtcp_recv_msg.header.length),
</ins><span class="cx"> ntohl(sr->ssrc),
</span><span class="cx"> ntohl(sr->ntp_msw),
</span><span class="cx"> ntohl(sr->ntp_lsw),
</span><span class="lines">@@ -2907,7 +2907,7 @@
</span><span class="cx"> rtp_session->rtcp_fresh_frame = 0;
</span><span class="cx">
</span><span class="cx"> frame->ssrc = ntohl(sr->ssrc);
</span><del>- frame->packet_type = rtp_session->rtcp_recv_msg.header.type;
</del><ins>+ frame->packet_type = (uint16_t)rtp_session->rtcp_recv_msg.header.type;
</ins><span class="cx"> frame->ntp_msw = ntohl(sr->ntp_msw);
</span><span class="cx"> frame->ntp_lsw = ntohl(sr->ntp_lsw);
</span><span class="cx"> frame->timestamp = ntohl(sr->ts);
</span><span class="lines">@@ -3337,8 +3337,8 @@
</span><span class="cx"> struct switch_rtcp_senderinfo* sr = (struct switch_rtcp_senderinfo*)rtp_session->rtcp_send_msg.body;
</span><span class="cx">
</span><span class="cx"> sr->ssrc = send_msg->header.ssrc;
</span><del>- 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));
</del><ins>+ 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)));
</ins><span class="cx"> sr->ts = send_msg->header.ts;
</span><span class="cx"> sr->pc = htonl(rtp_session->stats.outbound.packet_count);
</span><span class="cx"> sr->oc = htonl((rtp_session->stats.outbound.raw_bytes - rtp_session->stats.outbound.packet_count * sizeof(srtp_hdr_t)));
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>