<!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][16320] </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=16320">16320</a></dd>
<dt>Author</dt> <dd>mrene</dd>
<dt>Date</dt> <dd>2010-01-15 11:34:01 -0600 (Fri, 15 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>switch_ivr_originate: fix windows compiler warning</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodcodecsmod_g729Makefile">freeswitch/trunk/src/mod/codecs/mod_g729/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodcodecsmod_g729mod_g729c">freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_sqldbc">freeswitch/trunk/src/switch_core_sqldb.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivr_originatec">freeswitch/trunk/src/switch_ivr_originate.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodcodecsmod_g729Makefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/codecs/mod_g729/Makefile (16319 => 16320)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/codecs/mod_g729/Makefile 2010-01-15 15:18:07 UTC (rev 16319)
+++ freeswitch/trunk/src/mod/codecs/mod_g729/Makefile 2010-01-15 17:34:01 UTC (rev 16320)
</span><span class="lines">@@ -1,9 +1,7 @@
</span><span class="cx"> BASE=../../../..
</span><ins>+DIR=$(BASE)/libs/libg729
+A=$(DIR)/.libs/libg729.a
</ins><span class="cx">
</span><del>-DIR=$(switch_srcdir)/libs/libg729
-BUILDDIR=$(switch_builddir)/libs/libg729
-A=$(BUILDDIR)/.libs/libg729.a
-
-LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include" ; else echo "-DG729_PASSTHROUGH" ; fi ;
</del><ins>+LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include -I${DIR}" ; else echo "-DG729_PASSTHROUGH" ; fi ;
</ins><span class="cx"> LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A)
</span><span class="cx"> include $(BASE)/build/modmake.rules
</span></span></pre></div>
<a id="freeswitchtrunksrcmodcodecsmod_g729mod_g729c"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c (16319 => 16320)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c 2010-01-15 15:18:07 UTC (rev 16319)
+++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c 2010-01-15 17:34:01 UTC (rev 16320)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> SWITCH_MODULE_DEFINITION(mod_g729, mod_g729_load, NULL, NULL);
</span><span class="cx">
</span><span class="cx"> #ifndef G729_PASSTHROUGH
</span><del>-#include "g729.h"
</del><ins>+#include "g729ab.h"
</ins><span class="cx">
</span><span class="cx"> struct g729_context {
</span><span class="cx"> struct dec_state decoder_object;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_sqldbc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_sqldb.c (16319 => 16320)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_sqldb.c 2010-01-15 15:18:07 UTC (rev 16319)
+++ freeswitch/trunk/src/switch_core_sqldb.c 2010-01-15 17:34:01 UTC (rev 16320)
</span><span class="lines">@@ -1256,6 +1256,9 @@
</span><span class="cx">
</span><span class="cx"> switch_core_hash_init(&sql_manager.dbh_hash, sql_manager.memory_pool);
</span><span class="cx">
</span><ins>+ if (!manage) {
+ return SWITCH_STATUS_SUCCESS;
+ }
</ins><span class="cx"> top:
</span><span class="cx">
</span><span class="cx"> /* Activate SQL database */
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivr_originatec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_originate.c (16319 => 16320)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_originate.c 2010-01-15 15:18:07 UTC (rev 16319)
+++ freeswitch/trunk/src/switch_ivr_originate.c 2010-01-15 17:34:01 UTC (rev 16320)
</span><span class="lines">@@ -2609,7 +2609,7 @@
</span><span class="cx"> switch_channel_t *b_channel = originate_status[oglobals.bridge_early_media].peer_channel;
</span><span class="cx"> switch_core_session_t *b_session = originate_status[oglobals.bridge_early_media].peer_session;
</span><span class="cx"> switch_status_t b_status = SWITCH_STATUS_FALSE;
</span><del>- switch_frame_t *b_frame;
</del><ins>+ switch_frame_t *b_frame = NULL;
</ins><span class="cx">
</span><span class="cx"> if (b_channel && b_session) {
</span><span class="cx"> b_status = switch_core_session_read_frame(b_session, &b_frame, SWITCH_IO_FLAG_NONE, 0);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>