<!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][17196] </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=17196">17196</a></dd>
<dt>Author</dt> <dd>math.parent</dd>
<dt>Date</dt> <dd>2010-04-02 05:23:38 -0500 (Fri, 02 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge branch 'master' of git.freeswitch.org:freeswitch</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkgitignore">freeswitch/trunk/.gitignore</a></li>
<li><a href="#freeswitchtrunkMakefileam">freeswitch/trunk/Makefile.am</a></li>
<li><a href="#freeswitchtrunkbuildswigallsh">freeswitch/trunk/build/swigall.sh</a></li>
<li><a href="#freeswitchtrunkconfigurein">freeswitch/trunk/configure.in</a></li>
<li><a href="#freeswitchtrunklibsgitignore">freeswitch/trunk/libs/.gitignore</a></li>
<li><a href="#freeswitchtrunklibsaprutiltestdataempty">freeswitch/trunk/libs/apr-util/test/data/.empty</a></li>
<li><a href="#freeswitchtrunklibsesljavaclassesempty">freeswitch/trunk/libs/esl/java/classes/.empty</a></li>
<li><a href="#freeswitchtrunklibsfreetdmMakefileam">freeswitch/trunk/libs/freetdm/Makefile.am</a></li>
<li><a href="#freeswitchtrunklibsjsnsprpubincludeempty">freeswitch/trunk/libs/js/nsprpub/include/.empty</a></li>
<li><a href="#freeswitchtrunklibsjsnsprpubmacbuildempty">freeswitch/trunk/libs/js/nsprpub/macbuild/.empty</a></li>
<li><a href="#freeswitchtrunklibsjsnsprpubpkgsolarisSUNWnsprempty">freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnspr/.empty</a></li>
<li><a href="#freeswitchtrunklibsjsnsprpubpkgsolarisSUNWnsprxempty">freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnsprx/.empty</a></li>
<li><a href="#freeswitchtrunklibsjsnsprpubpkgsolarisSUNWprdevlempty">freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr-devl/.empty</a></li>
<li><a href="#freeswitchtrunklibsjsnsprpubpkgsolarisSUNWprdxempty">freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprdx/.empty</a></li>
<li><a href="#freeswitchtrunklibsjsnsprpubpkgsolarisSUNWprxempty">freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx/.empty</a></li>
<li><a href="#freeswitchtrunklibsjsnsprpubpkgsolarisSUNWprxdevlempty">freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx-devl/.empty</a></li>
<li><a href="#freeswitchtrunklibsjsnsprpubprsrccthreadsempty">freeswitch/trunk/libs/js/nsprpub/pr/src/cthreads/.empty</a></li>
<li><a href="#freeswitchtrunklibsjsnsprpubprtestsmacbuildempty">freeswitch/trunk/libs/js/nsprpub/pr/tests/macbuild/.empty</a></li>
<li><a href="#freeswitchtrunklibsportaudiodochtmlempty">freeswitch/trunk/libs/portaudio/doc/html/.empty</a></li>
<li><a href="#freeswitchtrunklibssofiasipconfigureac">freeswitch/trunk/libs/sofia-sip/configure.ac</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuasofiaam">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sofia.am</a></li>
<li><a href="#freeswitchtrunklibssofiasiprulessofiaam">freeswitch/trunk/libs/sofia-sip/rules/sofia.am</a></li>
<li><a href="#freeswitchtrunklibssqlitearttmpempty">freeswitch/trunk/libs/sqlite/art/tmp/.empty</a></li>
<li><a href="#freeswitchtrunklibssqlitenotesempty">freeswitch/trunk/libs/sqlite/notes/.empty</a></li>
<li><a href="#freeswitchtrunklibssqlitesrcexempty">freeswitch/trunk/libs/sqlite/src/ex/.empty</a></li>
<li><a href="#freeswitchtrunkscriptstagscriptsh">freeswitch/trunk/scripts/tagscript.sh</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_channelh">freeswitch/trunk/src/include/switch_channel.h</a></li>
<li><a href="#freeswitchtrunksrcmodgitignore">freeswitch/trunk/src/mod/.gitignore</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_enumMakefileam">freeswitch/trunk/src/mod/applications/mod_enum/Makefile.am</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_portaudioMakefileam">freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile.am</a></li>
<li><a href="#freeswitchtrunksrcmodformatsmod_portaudio_streamMakefileam">freeswitch/trunk/src/mod/formats/mod_portaudio_stream/Makefile.am</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedfreeswitch_wrapcxx">freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedmanagedswigcs">freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs</a></li>
<li><a href="#freeswitchtrunksrcmodtimersempty">freeswitch/trunk/src/mod/timers/.empty</a></li>
<li><a href="#freeswitchtrunksrcswitch_channelc">freeswitch/trunk/src/switch_channel.c</a></li>
<li><a href="#freeswitchtrunkwebetcempty">freeswitch/trunk/web/etc/.empty</a></li>
<li><a href="#freeswitchtrunkwebplanetempty">freeswitch/trunk/web/planet/.empty</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#freeswitchtrunkbuildswigallsh">freeswitch/trunk/build/swigall.sh</a></li>
<li><a href="#freeswitchtrunkscriptstagscriptsh">freeswitch/trunk/scripts/tagscript.sh</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkgitignore"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/.gitignore (17195 => 17196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/.gitignore 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/.gitignore 2010-04-02 10:23:38 UTC (rev 17196)
</span><span class="lines">@@ -8,6 +8,28 @@
</span><span class="cx"> .deps
</span><span class="cx"> .\#*
</span><span class="cx"> \#*
</span><ins>+Debug/
+Release/
+All/
+bin/
+*.user
+*.suo
+*.ncb
+*.pdb
+*.map
+*.lib
+*.obj
+*.idb
+*.res
+*.exp
+*.exe
+*.manifest
+*.dep
+*.dll
+BuildLog.htm
+Path
+w32/Library/lastversion
+w32/Library/tmpVersion.Bat
</ins><span class="cx"> .version
</span><span class="cx"> AUTHORS
</span><span class="cx"> COPYING
</span><span class="lines">@@ -17,6 +39,7 @@
</span><span class="cx"> NEWS
</span><span class="cx"> README
</span><span class="cx"> aclocal.m4
</span><ins>+autom4te.cache
</ins><span class="cx"> build/Makefile
</span><span class="cx"> build/Makefile.in
</span><span class="cx"> build/config/compile
</span><span class="lines">@@ -33,6 +56,7 @@
</span><span class="cx"> config.log
</span><span class="cx"> config.status
</span><span class="cx"> configure
</span><ins>+configure.lineno
</ins><span class="cx"> freeswitch
</span><span class="cx"> fs_cli
</span><span class="cx"> fs_ivrd
</span></span></pre></div>
<a id="freeswitchtrunkMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/Makefile.am (17195 => 17196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/Makefile.am 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/Makefile.am 2010-04-02 10:23:38 UTC (rev 17196)
</span><span class="lines">@@ -349,7 +349,21 @@
</span><span class="cx"> cat src/include/switch_version.h.in > src/include/switch_version.h ; \
</span><span class="cx"> touch .version ; \
</span><span class="cx"> else \
</span><del>- version=`svnversion . -n || echo hacked` ; \
</del><ins>+ if [ -d .git ] ; then \
+ version=`git log --format="%h %ci" -1 HEAD | head -1 || echo hacked` ; \
+ if [ "x$$version" == "xhacked" ] ; then \
+ version="hacked-`date -u +%Y%m%dT%H%M%SZ`" ; \
+ else \
+ version="git-$$version" ; \
+ fi ;\
+ else \
+ version=`svnversion . -n || echo hacked` ; \
+ if [ "x$$version" == "xhacked" ] ; then \
+ version="hacked-`date -u +%Y%m%dT%H%M%SZ`" ; \
+ else \
+ version="svn-$$version" ; \
+ fi ;\
+ fi ; \
</ins><span class="cx"> oldversion=`cat .version 2>/dev/null || echo "0"` ; \
</span><span class="cx"> if test "$$oldversion" != "$$version" || test $$force = 1 ; then \
</span><span class="cx"> cat src/include/switch_version.h.in | sed "s/@SWITCH_VERSION_REVISION@/$$version/g" > src/include/switch_version.h ; \
</span><span class="lines">@@ -437,23 +451,29 @@
</span><span class="cx"> test -d $(DESTDIR)$(sysconfdir) || $(MAKE) samples-conf
</span><span class="cx"> test -d $(DESTDIR)$(htdocsdir) || $(MAKE) samples-htdocs
</span><span class="cx">
</span><del>-is-svn:
- @if [ ! -d .svn ] ; then \
</del><ins>+is-scm:
+ @if [ ! -d .svn -a ! -d .git ] ; then \
</ins><span class="cx"> echo ; echo ; \
</span><del>- echo "**************************************************************************************************" ; \
- echo "You can not update a release tarball or without a svn working copy, please checkout fresh from svn" ; \
- echo "**************************************************************************************************" ; \
</del><ins>+ echo "*****************************************************************************************************" ; \
+ echo "You can not update a release tarball or without a git or svn working copy please clone our git tree: " ; \
+ echo "git clone git://git.freeswitch.org/freeswitch.git " ; \
+ echo "or check out our read only svn mirror: " ; \
+ echo "svn checkout http://svn.freeswitch.org/svn/freeswitch/trunk " ; \
+ echo "*****************************************************************************************************" ; \
</ins><span class="cx"> echo ; echo ; \
</span><span class="cx"> exit 1; \
</span><span class="cx"> fi
</span><span class="cx">
</span><del>-update: is-svn
</del><ins>+update: is-scm
</ins><span class="cx"> @if test -d .svn ; then \
</span><span class="cx"> test ! -f .version || rm -f .version ; \
</span><span class="cx"> echo Updating... ; \
</span><span class="cx"> svn update ; \
</span><ins>+ elif test -d .git ; then \
+ echo "Pulling updates..." ; \
+ git pull ; \
</ins><span class="cx"> else \
</span><del>- echo "This source directory is not an svn working copy" ; \
</del><ins>+ echo "This source directory is not a git tree or svn working copy" ; \
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> .nodepends:
</span><span class="lines">@@ -483,18 +503,18 @@
</span><span class="cx">
</span><span class="cx"> everything: install
</span><span class="cx">
</span><del>-up: is-svn clean
- svn update
</del><ins>+up: is-scm clean
+ $(MAKE) update
</ins><span class="cx"> $(MAKE) -j core
</span><span class="cx"> $(MAKE) -j modules
</span><span class="cx"> $(MAKE) install
</span><span class="cx">
</span><del>-sync: is-svn
- svn update
</del><ins>+sync: is-scm
+ $(MAKE) update
</ins><span class="cx"> $(MAKE) install
</span><span class="cx">
</span><del>-speedy-sync: is-svn
- svn update
</del><ins>+speedy-sync: is-scm
+ $(MAKE) update
</ins><span class="cx"> $(MAKE) -j install
</span><span class="cx">
</span><span class="cx"> libs/openzap/Makefile:
</span><span class="lines">@@ -570,15 +590,15 @@
</span><span class="cx"> @echo
</span><span class="cx"> @echo http://www.cluecon.com
</span><span class="cx"> @sleep 5
</span><del>-current: cluecon is-svn update-clean
- svn update
</del><ins>+current: cluecon update-clean is-scm
+ $(MAKE) update
</ins><span class="cx"> $(MAKE) all
</span><span class="cx"> $(MAKE) install
</span><span class="cx">
</span><span class="cx"> installall: current
</span><span class="cx">
</span><del>-speedy-current: is-svn update-clean
- svn update
</del><ins>+speedy-current: update-clean is-scm
+ $(MAKE) update
</ins><span class="cx"> $(MAKE) speedy-sure
</span><span class="cx"> $(MAKE) install
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkbuildswigallsh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/build/swigall.sh (17195 => 17196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/build/swigall.sh 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/build/swigall.sh 2010-04-02 10:23:38 UTC (rev 17196)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> cd src/mod/languages/mod_lua
</span><span class="cx"> make swigclean
</span><del>-make mod_lua_wrap.cpp
</del><ins>+make lua_wrap
</ins><span class="cx"> cd ../../../..
</span><span class="cx">
</span><span class="cx"> cd src/mod/languages/mod_perl
</span></span></pre></div>
<a id="freeswitchtrunkconfigurein"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/configure.in (17195 => 17196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/configure.in 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/configure.in 2010-04-02 10:23:38 UTC (rev 17196)
</span><span class="lines">@@ -3,11 +3,11 @@
</span><span class="cx">
</span><span class="cx"> # Must change all of the below together
</span><span class="cx"> # For a release, set revision for that tagged release as well and uncomment
</span><del>-AC_INIT([freeswitch], [1.0.trunk], BUG-REPORT-ADDRESS)
</del><ins>+AC_INIT([freeswitch], [1.0.head], BUG-REPORT-ADDRESS)
</ins><span class="cx"> AC_SUBST(SWITCH_VERSION_MAJOR, [1])
</span><span class="cx"> AC_SUBST(SWITCH_VERSION_MINOR, [0])
</span><del>-AC_SUBST(SWITCH_VERSION_MICRO, [trunk])
-#AC_SUBST(SWITCH_VERSION_REVISION, [svn-revision-here])
</del><ins>+AC_SUBST(SWITCH_VERSION_MICRO, [head])
+#AC_SUBST(SWITCH_VERSION_REVISION, [])
</ins><span class="cx">
</span><span class="cx"> AC_CONFIG_FILES([src/include/switch_version.h.in:src/include/switch_version.h.template])
</span><span class="cx"> AC_CONFIG_FILES([.version:.version.in])
</span></span></pre></div>
<a id="freeswitchtrunklibsgitignore"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/.gitignore (17195 => 17196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/.gitignore 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/libs/.gitignore 2010-04-02 10:23:38 UTC (rev 17196)
</span><span class="lines">@@ -189,6 +189,9 @@
</span><span class="cx"> ilbc/src/stamp-h1
</span><span class="cx"> ilbc/tests/Makefile
</span><span class="cx"> ilbc/tests/Makefile.in
</span><ins>+js/nsprpub/lib/ds/libplds4.so.1
+js/nsprpub/lib/libc/src/libplc4.so.1
+js/nsprpub/pr/src/libnspr4.so.1
</ins><span class="cx"> js/Makefile
</span><span class="cx"> js/aclocal.m4
</span><span class="cx"> js/config.guess
</span><span class="lines">@@ -990,3 +993,74 @@
</span><span class="cx"> unimrcp/build/acmacros/ltsugar.m4
</span><span class="cx"> unimrcp/build/acmacros/ltversion.m4
</span><span class="cx"> unimrcp/build/acmacros/lt~obsolete.m4
</span><ins>+*.tar.gz
+celt-0.7.1/
+flite-1.3.99/
+freeradius-client-1.1.6/
+iksemel/test/tst-dom
+iksemel/test/tst-filter
+iksemel/test/tst-iks
+iksemel/test/tst-ikstack
+iksemel/test/tst-jid
+iksemel/test/tst-md5
+iksemel/test/tst-sax
+iksemel/test/tst-sha
+iksemel/tools/ikslint
+iksemel/tools/iksperf
+iksemel/tools/iksroster
+json-c-0.9/
+lame-3.97/
+libmemcached-0.32/
+libshout-2.2.2/
+mpg123/
+openldap-2.4.19/
+pocketsphinx-0.5.99/
+portaudio/bin-stamp
+portaudio/bin/
+portaudio/lib-stamp
+silk/Decoder
+silk/Encoder
+silk/signalCompare
+soundtouch-1.3.1/
+sphinxbase-0.4.99/
+unimrcp/platforms/asr-client/asrclient
+unimrcp/platforms/umc/umc
+unimrcp/platforms/unimrcp-client/unimrcpclient
+unimrcp/platforms/unimrcp-server/unimrcpserver
+yaml/config.h
+yaml/stamp-h1
+yaml/tests/example-deconstructor
+yaml/tests/example-deconstructor-alt
+yaml/tests/example-reformatter
+yaml/tests/example-reformatter-alt
+yaml/tests/run-dumper
+yaml/tests/run-emitter
+yaml/tests/run-loader
+yaml/tests/run-parser
+yaml/tests/run-scanner
+Communicator_semi_40.cd_semi_6000/
+libogg-1.1.3/
+pthreads-w32-2-7-0-release/
+sounds/
+sphinxbase-0.4.99/
+sofia-sip/libsofia-sip-ua/http/http_tag_dll.c
+sofia-sip/libsofia-sip-ua/iptsec/auth_tag_dll.c
+sofia-sip/libsofia-sip-ua/msg/msg_tag_dll.c
+sofia-sip/libsofia-sip-ua/msg/msg_tag_ref.c
+sofia-sip/libsofia-sip-ua/nea/nea_tag_dll.c
+sofia-sip/libsofia-sip-ua/nta/nta_tag_dll.c
+sofia-sip/libsofia-sip-ua/nth/nth_tag_dll.c
+sofia-sip/libsofia-sip-ua/nua/nua_tag_dll.c
+sofia-sip/libsofia-sip-ua/sdp/sdp_tag_dll.c
+sofia-sip/libsofia-sip-ua/sip/sip_tag_dll.c
+sofia-sip/libsofia-sip-ua/soa/soa_tag_dll.c
+sofia-sip/libsofia-sip-ua/stun/stun_tag_dll.c
+sofia-sip/libsofia-sip-ua/su/su_tag_dll.c
+sofia-sip/libsofia-sip-ua/tport/tport_tag_dll.c
+sofia-sip/libsofia-sip-ua/url/url_tag_dll.c
+win32/pcre/pcre_chartables.c
+apr-util/include/apu_config.h
+apr-util/include/apu_select_dbm.h
+include/
+js/nsprpub/pr/include/prcpucfg.h
+apr-util/xml/expat/lib/config.h
</ins></span></pre></div>
<a id="freeswitchtrunklibsaprutiltestdataempty"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/apr-util/test/data/.empty ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/esl/java/classes/.empty
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/Makefile.am (17195 => 17196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/Makefile.am 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/libs/freetdm/Makefile.am 2010-04-02 10:23:38 UTC (rev 17196)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> #
</span><span class="cx"> # tools & test programs
</span><span class="cx"> #
</span><del>-noinst_PROGRAMS = testtones detect_tones detect_dtmf testisdn testpri testr2 testanalog testapp testcid
</del><ins>+noinst_PROGRAMS = testtones detect_tones detect_dtmf testpri testr2 testanalog testapp testcid #testisdn
</ins><span class="cx"> if HAVE_SCTP
</span><span class="cx"> noinst_PROGRAMS += testboost
</span><span class="cx"> endif
</span><span class="lines">@@ -131,9 +131,9 @@
</span><span class="cx"> detect_dtmf_LDADD = libfreetdm.la
</span><span class="cx"> detect_dtmf_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS)
</span><span class="cx">
</span><del>-testisdn_SOURCES = $(SRC)/testisdn.c
-testisdn_LDADD = libfreetdm.la
-testisdn_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS)
</del><ins>+#testisdn_SOURCES = $(SRC)/testisdn.c
+#testisdn_LDADD = libfreetdm.la
+#testisdn_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS)
</ins><span class="cx">
</span><span class="cx"> testpri_SOURCES = $(SRC)/testpri.c
</span><span class="cx"> testpri_LDADD = libfreetdm.la
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> #
</span><span class="cx"> # ftmod modules
</span><span class="cx"> #
</span><del>-mod_LTLIBRARIES = ftmod_zt.la ftmod_skel.la ftmod_isdn.la ftmod_analog.la ftmod_analog_em.la
</del><ins>+mod_LTLIBRARIES = ftmod_zt.la ftmod_skel.la ftmod_analog.la ftmod_analog_em.la #ftmod_isdn.la
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> if HAVE_SCTP
</span><span class="lines">@@ -196,32 +196,32 @@
</span><span class="cx"> ftmod_wanpipe_la_LIBADD = $(MYLIB)
</span><span class="cx"> endif
</span><span class="cx">
</span><del>-ftmod_isdn_la_SOURCES = \
-$(SRC)/isdn/EuroISDNStateNT.c \
-$(SRC)/isdn/EuroISDNStateTE.c \
-$(SRC)/isdn/mfifo.c \
-$(SRC)/isdn/Q921.c \
-$(SRC)/isdn/Q931api.c \
-$(SRC)/isdn/Q931.c \
-$(SRC)/isdn/Q931ie.c \
-$(SRC)/isdn/Q931mes.c \
-$(SRC)/isdn/Q931StateNT.c \
-$(SRC)/isdn/Q931StateTE.c \
-$(SRC)/isdn/nationalmes.c \
-$(SRC)/isdn/nationalStateNT.c \
-$(SRC)/isdn/nationalStateTE.c \
-$(SRC)/isdn/DMSmes.c \
-$(SRC)/isdn/DMSStateNT.c \
-$(SRC)/isdn/DMSStateTE.c \
-$(SRC)/isdn/5ESSmes.c \
-$(SRC)/isdn/5ESSStateNT.c \
-$(SRC)/isdn/5ESSStateTE.c \
-$(SRC)/isdn/Q932mes.c \
-$(SRC)/ftmod/ftmod_isdn/ftmod_isdn.c
</del><ins>+#ftmod_isdn_la_SOURCES = \
+#$(SRC)/isdn/EuroISDNStateNT.c \
+#$(SRC)/isdn/EuroISDNStateTE.c \
+#$(SRC)/isdn/mfifo.c \
+#$(SRC)/isdn/Q921.c \
+#$(SRC)/isdn/Q931api.c \
+#$(SRC)/isdn/Q931.c \
+#$(SRC)/isdn/Q931ie.c \
+#$(SRC)/isdn/Q931mes.c \
+#$(SRC)/isdn/Q931StateNT.c \
+#$(SRC)/isdn/Q931StateTE.c \
+#$(SRC)/isdn/nationalmes.c \
+#$(SRC)/isdn/nationalStateNT.c \
+#$(SRC)/isdn/nationalStateTE.c \
+#$(SRC)/isdn/DMSmes.c \
+#$(SRC)/isdn/DMSStateNT.c \
+#$(SRC)/isdn/DMSStateTE.c \
+#$(SRC)/isdn/5ESSmes.c \
+#$(SRC)/isdn/5ESSStateNT.c \
+#$(SRC)/isdn/5ESSStateTE.c \
+#$(SRC)/isdn/Q932mes.c \
+#$(SRC)/ftmod/ftmod_isdn/ftmod_isdn.c
</ins><span class="cx">
</span><del>-ftmod_isdn_la_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS) -D_GNU_SOURCE
-ftmod_isdn_la_LDFLAGS = $(PCAP_LIB_FLAGS) -module -avoid-version
-ftmod_isdn_la_LIBADD = $(MYLIB)
</del><ins>+#ftmod_isdn_la_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS) -D_GNU_SOURCE
+#ftmod_isdn_la_LDFLAGS = $(PCAP_LIB_FLAGS) -module -avoid-version
+#ftmod_isdn_la_LIBADD = $(MYLIB)
</ins><span class="cx">
</span><span class="cx"> ftmod_analog_la_SOURCES = $(SRC)/ftmod/ftmod_analog/ftmod_analog.c
</span><span class="cx"> ftmod_analog_la_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS)
</span></span></pre></div>
<a id="freeswitchtrunklibsjsnsprpubincludeempty"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/js/nsprpub/include/.empty ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/js/nsprpub/macbuild/.empty
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunklibsjsnsprpubpkgsolarisSUNWnsprempty"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnspr/.empty ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnsprx/.empty
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunklibsjsnsprpubpkgsolarisSUNWprdevlempty"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr-devl/.empty ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprdx/.empty
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunklibsjsnsprpubpkgsolarisSUNWprxempty"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx/.empty ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx-devl/.empty
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunklibsjsnsprpubprsrccthreadsempty"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/cthreads/.empty ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/js/nsprpub/pr/tests/macbuild/.empty
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunklibsportaudiodochtmlempty"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/portaudio/doc/html/.empty ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/sofia-sip/configure.ac
</span><span class="cx">===================================================================
</span><del>--- freeswitch/trunk/libs/sofia-sip/configure.ac 2010-04-02 10:21:47 UTC (rev 17195)
</del><ins>+++ freeswitch/trunk/libs/sofia-sip/configure.ac 2010-04-02 10:23:38 UTC (rev 17196)
</ins><span class="lines">@@ -100,14 +100,17 @@
</span><span class="cx"> fi
</span><span class="cx"> fi
</span><span class="cx">
</span><ins>+SOFIA_PLAT_CFLAGS=
</ins><span class="cx"> # openbsd seems to not define NULL as a void pointer, I blame standards by committee for this.
</span><span class="cx"> # This is a dirty hack, but shuts up all the warnings
</span><span class="cx"> case "$host" in
</span><del>- *-openbsd*) SOFIA_CFLAGS="$SOFIA_CFLAGS -DNULL='(void *) 0L'";;
</del><ins>+ *-openbsd*) SOFIA_PLAT_CFLAGS="-DNULL='(void *) 0L'";;
</ins><span class="cx"> *) ;;
</span><span class="cx"> esac
</span><span class="cx">
</span><ins>+AC_SUBST(SOFIA_PLAT_CFLAGS, $SOFIA_PLAT_CFLAGS)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> ### checks for header files
</span><span class="cx"> ### -----------------------
</span><span class="cx"> AC_HEADER_STDC
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuasofiaam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sofia.am (17195 => 17196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sofia.am 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sofia.am 2010-04-02 10:23:38 UTC (rev 17196)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> # common Makefile targets for libsofia-sip-ua modules
</span><span class="cx"> # ---------------------------------------------------
</span><span class="cx">
</span><del>-AM_CFLAGS = $(CWFLAG) $(SOFIA_CFLAGS) $(SOFIA_COVERAGE)
</del><ins>+AM_CFLAGS = $(CWFLAG) $(SOFIA_CFLAGS) $(SOFIA_COVERAGE) $(SOFIA_PLAT_CFLAGS)
</ins><span class="cx">
</span><span class="cx"> # Use with --enable-ndebug
</span><span class="cx"> if NDEBUG
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiprulessofiaam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/rules/sofia.am (17195 => 17196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/rules/sofia.am 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/libs/sofia-sip/rules/sofia.am 2010-04-02 10:23:38 UTC (rev 17196)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> sofiasrcdir = ${top_srcdir}/libsofia-sip-ua
</span><span class="cx"> sofiabuilddir = ${top_builddir}/libsofia-sip-ua
</span><span class="cx">
</span><del>-AM_CFLAGS = $(CWFLAG) $(SOFIA_COVERAGE) $(SOFIA_CFLAGS) $(openssl_CFLAGS)
</del><ins>+AM_CFLAGS = $(CWFLAG) $(SOFIA_COVERAGE) $(SOFIA_CFLAGS) $(openssl_CFLAGS) $(SOFIA_PLAT_CFLAGS)
</ins><span class="cx">
</span><span class="cx"> SOFIA_COVERAGE = $(COVERAGE_FLAGS)
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunklibssqlitearttmpempty"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sqlite/art/tmp/.empty ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/sqlite/notes/.empty
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunklibssqlitesrcexempty"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sqlite/src/ex/.empty ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/scripts/tagscript.sh
</span><span class="cx">===================================================================
</span><del>--- freeswitch/trunk/scripts/tagscript.sh 2010-04-02 10:21:47 UTC (rev 17195)
</del><ins>+++ freeswitch/trunk/scripts/tagscript.sh 2010-04-02 10:23:38 UTC (rev 17196)
</ins><span class="lines">@@ -35,11 +35,12 @@
</span><span class="cx"> sed -e "s|\(AC_SUBST(SWITCH_VERSION_MAJOR, \[\).*\(\])\)|\1$major\2|" \
</span><span class="cx"> -e "s|\(AC_SUBST(SWITCH_VERSION_MINOR, \[\).*\(\])\)|\1$minor\2|" \
</span><span class="cx"> -e "s|\(AC_SUBST(SWITCH_VERSION_MICRO, \[\).*\(\])\)|\1$micro\2|" \
</span><del>- -e "s|\(AC_SUBST(SWITCH_VERSION_REVISION, \[\).*\(\])\)|\1$rev\2|" \
</del><ins>+ -e "s|\(AC_INIT(\[freeswitch\], \[\).*\(\], BUG-REPORT-ADDRESS)\)|\1$major.$minor.$micro\2|" \
</ins><span class="cx"> -i configure.in
</span><span class="cx">
</span><span class="cx"> if [ -n "$rev" ]; then
</span><del>- sed -e "s|#\(AC_SUBST(SWITCH_VERSION_REVISION\)|\1|" \
</del><ins>+ sed -e "s|\(AC_SUBST(SWITCH_VERSION_REVISION, \[\).*\(\])\)|\1$rev\2|" \
+ -e "s|#\(AC_SUBST(SWITCH_VERSION_REVISION\)|\1|" \
</ins><span class="cx"> -i configure.in
</span><span class="cx"> fi
</span><span class="cx">
</span><span class="lines">@@ -63,14 +64,14 @@
</span><span class="cx"> cd ..
</span><span class="cx"> tar -czvf $dst_name.tar.gz $dst_dir
</span><span class="cx"> tar -cjvf $dst_name.tar.bz2 $dst_dir
</span><del>-tar -cJvf $dst_name.tar.xz $dst_dir
</del><ins>+tar -cJvf $dst_name.tar.xz $dst_dir || echo tar does not support -J
</ins><span class="cx"> rm -rf $dst_dir
</span><span class="cx">
</span><span class="cx"> cat 1>&2 <<EOF
</span><span class="cx"> ----------------------------------------------------------------------
</span><span class="cx"> The v$ver tag has been committed locally, but it will not be
</span><del>-globally visible until you 'git push' this repository up to the server
-(I didn't do that for you).
</del><ins>+globally visible until you 'git push --tags' this repository up to the
+server (I didn't do that for you, as you might want to review first).
</ins><span class="cx"> ----------------------------------------------------------------------
</span><span class="cx"> EOF
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_channelh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_channel.h (17195 => 17196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_channel.h 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/src/include/switch_channel.h 2010-04-02 10:23:38 UTC (rev 17196)
</span><span class="lines">@@ -245,6 +245,11 @@
</span><span class="cx"> #define switch_channel_set_variable(_channel, _var, _val) switch_channel_set_variable_var_check(_channel, _var, _val, SWITCH_TRUE)
</span><span class="cx"> #define switch_channel_set_variable_partner(_channel, _var, _val) switch_channel_set_variable_partner_var_check(_channel, _var, _val, SWITCH_TRUE)
</span><span class="cx">
</span><ins>+
+SWITCH_DECLARE(switch_status_t) switch_channel_export_variable_var_check(switch_channel_t *channel, const char *varname, const char *value, switch_bool_t var_check, switch_bool_t nolocal);
+
+#define switch_channel_export_variable(_channel, _varname, _value, _nolocal) switch_channel_export_variable_var_check(_channel, _varname, _value, SWITCH_TRUE, _nolocal)
+
</ins><span class="cx"> /*!
</span><span class="cx"> \brief Retrieve a variable from a given channel
</span><span class="cx"> \param channel channel to retrieve variable from
</span></span></pre></div>
<a id="freeswitchtrunksrcmodgitignore"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/.gitignore (17195 => 17196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/.gitignore 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/src/mod/.gitignore 2010-04-02 10:23:38 UTC (rev 17196)
</span><span class="lines">@@ -50,3 +50,10 @@
</span><span class="cx"> loggers/mod_syslog/Makefile
</span><span class="cx"> say/mod_say_en/Makefile
</span><span class="cx"> say/mod_say_ru/Makefile
</span><ins>+applications/mod_stress/mod_stress.log
+asr_tts/mod_unimrcp/mod_unimrcp.log
+endpoints/mod_portaudio/mod_portaudio.log
+endpoints/mod_skypopen/mod_skypopen.log
+formats/mod_portaudio_stream/mod_portaudio_stream.log
+languages/mod_java/freeswitch.jar
+languages/mod_managed/freeswitch_wrap.cpp
</ins></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_enumMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_enum/Makefile.am (17195 => 17196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_enum/Makefile.am 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/src/mod/applications/mod_enum/Makefile.am 2010-04-02 10:23:38 UTC (rev 17196)
</span><span class="lines">@@ -2,13 +2,12 @@
</span><span class="cx"> MODNAME=mod_enum
</span><span class="cx">
</span><span class="cx"> UDNS_DIR=$(switch_srcdir)/libs/udns
</span><del>-AM_CFLAGS += -I$(UDNS_DIR) -DHAVE_POLL
</del><ins>+mod_enum_la_CFLAGS = -I$(UDNS_DIR) -DHAVE_POLL $(AM_CFLAGS)
</ins><span class="cx">
</span><span class="cx"> mod_LTLIBRARIES = mod_enum.la
</span><span class="cx"> mod_enum_la_SOURCES = mod_enum.c
</span><span class="cx"> mod_enum_la_SOURCES += $(UDNS_DIR)/udns_dn.c $(UDNS_DIR)/udns_dntosp.c $(UDNS_DIR)/udns_parse.c $(UDNS_DIR)/udns_misc.c
</span><span class="cx"> mod_enum_la_SOURCES += $(UDNS_DIR)/udns_rr_a.c $(UDNS_DIR)/udns_rr_ptr.c $(UDNS_DIR)/udns_rr_mx.c $(UDNS_DIR)/udns_rr_txt.c $(UDNS_DIR)/udns_bl.c
</span><span class="cx"> mod_enum_la_SOURCES += $(UDNS_DIR)/udns_rr_srv.c $(UDNS_DIR)/udns_rr_naptr.c $(UDNS_DIR)/udns_codes.c $(UDNS_DIR)/udns_resolver.c
</span><del>-mod_enum_la_CFLAGS = $(AM_CFLAGS)
</del><span class="cx"> mod_enum_la_LIBADD = $(switch_builddir)/libfreeswitch.la
</span><span class="cx"> mod_enum_la_LDFLAGS = -avoid-version -module -no-undefined -shared
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_portaudioMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile.am (17195 => 17196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile.am 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile.am 2010-04-02 10:23:38 UTC (rev 17196)
</span><span class="lines">@@ -6,8 +6,7 @@
</span><span class="cx">
</span><span class="cx"> mod_LTLIBRARIES = mod_portaudio.la
</span><span class="cx"> mod_portaudio_la_SOURCES = mod_portaudio.c pablio.c pa_ringbuffer.c
</span><del>-mod_portaudio_la_CFLAGS = $(AM_CFLAGS)
-mod_portaudio_la_CFLAGS += -I. -I$(PA_DIR)/include -D__EXTENSION__=1
</del><ins>+mod_portaudio_la_CFLAGS = -I. -I$(PA_DIR)/include -D__EXTENSION__=1 $(AM_CFLAGS)
</ins><span class="cx"> mod_portaudio_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(PALA)
</span><span class="cx"> mod_portaudio_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(PA_LIBS)
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodformatsmod_portaudio_streamMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/formats/mod_portaudio_stream/Makefile.am (17195 => 17196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/formats/mod_portaudio_stream/Makefile.am 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/src/mod/formats/mod_portaudio_stream/Makefile.am 2010-04-02 10:23:38 UTC (rev 17196)
</span><span class="lines">@@ -7,8 +7,7 @@
</span><span class="cx">
</span><span class="cx"> mod_LTLIBRARIES = mod_portaudio_stream.la
</span><span class="cx"> mod_portaudio_stream_la_SOURCES = mod_portaudio_stream.c $(MODPA_DIR)/pablio.c $(MODPA_DIR)/pa_ringbuffer.c
</span><del>-mod_portaudio_stream_la_CFLAGS = $(AM_CFLAGS)
-mod_portaudio_stream_la_CFLAGS += -I. -I$(PA_DIR)/include -D__EXTENSION__=1 -I$(MODPA_DIR)
</del><ins>+mod_portaudio_stream_la_CFLAGS = -I. -I$(PA_DIR)/include -D__EXTENSION__=1 -I$(MODPA_DIR) $(AM_CFLAGS)
</ins><span class="cx"> mod_portaudio_stream_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(PALA)
</span><span class="cx"> mod_portaudio_stream_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(PA_LIBS)
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedfreeswitch_wrapcxx"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (17195 => 17196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx 2010-04-02 10:23:38 UTC (rev 17196)
</span><span class="lines">@@ -21403,6 +21403,26 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_export_variable_var_check(void * jarg1, char * jarg2, char * jarg3, int jarg4, int jarg5) {
+ int jresult ;
+ switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+ char *arg2 = (char *) 0 ;
+ char *arg3 = (char *) 0 ;
+ switch_bool_t arg4 ;
+ switch_bool_t arg5 ;
+ switch_status_t result;
+
+ arg1 = (switch_channel_t *)jarg1;
+ arg2 = (char *)jarg2;
+ arg3 = (char *)jarg3;
+ arg4 = (switch_bool_t)jarg4;
+ arg5 = (switch_bool_t)jarg5;
+ result = (switch_status_t)switch_channel_export_variable_var_check(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5);
+ jresult = result;
+ return jresult;
+}
+
+
</ins><span class="cx"> SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_variable_dup(void * jarg1, char * jarg2, int jarg3) {
</span><span class="cx"> char * jresult ;
</span><span class="cx"> switch_channel_t *arg1 = (switch_channel_t *) 0 ;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedmanagedswigcs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (17195 => 17196)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs 2010-04-02 10:21:47 UTC (rev 17195)
+++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs 2010-04-02 10:23:38 UTC (rev 17196)
</span><span class="lines">@@ -2904,6 +2904,11 @@
</span><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ public static switch_status_t switch_channel_export_variable_var_check(SWIGTYPE_p_switch_channel channel, string varname, string value, switch_bool_t var_check, switch_bool_t nolocal) {
+ switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_channel_export_variable_var_check(SWIGTYPE_p_switch_channel.getCPtr(channel), varname, value, (int)var_check, (int)nolocal);
+ return ret;
+ }
+
</ins><span class="cx"> public static string switch_channel_get_variable_dup(SWIGTYPE_p_switch_channel channel, string varname, switch_bool_t dup) {
</span><span class="cx"> string ret = freeswitchPINVOKE.switch_channel_get_variable_dup(SWIGTYPE_p_switch_channel.getCPtr(channel), varname, (int)dup);
</span><span class="cx"> return ret;
</span><span class="lines">@@ -10209,6 +10214,9 @@
</span><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_get_variable_partner")]
</span><span class="cx"> public static extern string switch_channel_get_variable_partner(HandleRef jarg1, string jarg2);
</span><span class="cx">
</span><ins>+ [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_export_variable_var_check")]
+ public static extern int switch_channel_export_variable_var_check(HandleRef jarg1, string jarg2, string jarg3, int jarg4, int jarg5);
+
</ins><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_get_variable_dup")]
</span><span class="cx"> public static extern string switch_channel_get_variable_dup(HandleRef jarg1, string jarg2, int jarg3);
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodtimersempty"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/timers/.empty ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/switch_channel.c
</span><span class="cx">===================================================================
</span><del>--- freeswitch/trunk/src/switch_channel.c 2010-04-02 10:21:47 UTC (rev 17195)
</del><ins>+++ freeswitch/trunk/src/switch_channel.c 2010-04-02 10:23:38 UTC (rev 17196)
</ins><span class="lines">@@ -737,6 +737,37 @@
</span><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SWITCH_DECLARE(switch_status_t) switch_channel_export_variable_var_check(switch_channel_t *channel, const char *varname, const char *value, switch_bool_t var_check, switch_bool_t nolocal)
+{
+ const char *exports, *exports_varname = varname;
+ switch_status_t status;
+
+ exports = switch_channel_get_variable(channel, SWITCH_EXPORT_VARS_VARIABLE);
+
+ if (nolocal) {
+ exports_varname = switch_mprintf("nolocal:%s", varname);
+ }
+
+ if ((status = switch_channel_set_variable_var_check(channel, exports_varname, value, var_check)) != SWITCH_STATUS_SUCCESS) {
+ goto done;
+ }
+
+ if (varname && value) {
+ if (exports) {
+ switch_channel_set_variable_printf(channel, SWITCH_EXPORT_VARS_VARIABLE, "%s,%s", exports, exports_varname);
+ } else {
+ switch_channel_set_variable(channel, SWITCH_EXPORT_VARS_VARIABLE, exports_varname);
+ }
+ }
+
+done:
+ if (exports_varname != varname) {
+ free((char*)exports_varname);
+ }
+
+ return status;
+}
+
</ins><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_var_check(switch_channel_t *channel,
</span><span class="cx"> const char *varname, const char *value, switch_bool_t var_check)
</span><span class="cx"> {
</span></span></pre></div>
<a id="freeswitchtrunkwebetcempty"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/web/etc/.empty ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/web/planet/.empty
</span><span class="cx">===================================================================
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>