[svn-commits] irroot: branch irroot/distrotech-customers-1.8 r320943 - in /team/irroot/dist...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu May 26 03:13:11 CDT 2011
Author: irroot
Date: Thu May 26 03:12:59 2011
New Revision: 320943
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=320943
Log:
Compat Changes h/t mnicholson
Modified:
team/irroot/distrotech-customers-1.8/ (props changed)
team/irroot/distrotech-customers-1.8/cel/cel_odbc.c (props changed)
team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample (props changed)
team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/iaxfriends.sql (props changed)
team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/meetme.sql (props changed)
team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/sipfriends.sql (props changed)
team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/voicemail.sql (props changed)
team/irroot/distrotech-customers-1.8/contrib/realtime/postgresql/realtime.sql (props changed)
team/irroot/distrotech-customers-1.8/res/res_fax.c
team/irroot/distrotech-customers-1.8/res/res_fax_spandsp.c
Propchange: team/irroot/distrotech-customers-1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 26 03:12:59 2011
@@ -2,4 +2,4 @@
/team/irroot/distrotech-customers-1.8:319067
/team/irroot/distrotech-customers-trunk:320619,320821-320822
/team/irroot/t38gateway-1.8:318979-319017,319357
-/team/irroot/t38gateway-trunk:318977-319016,319067,319071
+/team/irroot/t38gateway-trunk:318977-319016,319067,319071,320879
Propchange: team/irroot/distrotech-customers-1.8/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 26 03:12:59 2011
@@ -2,4 +2,4 @@
/team/irroot/distrotech-customers-1.8/cel/cel_odbc.c:319067
/team/irroot/distrotech-customers-trunk/cel/cel_odbc.c:320619,320821-320822
/team/irroot/t38gateway-1.8/cel/cel_odbc.c:318979-319017,319357
-/team/irroot/t38gateway-trunk/cel/cel_odbc.c:318977-319016,319067,319071
+/team/irroot/t38gateway-trunk/cel/cel_odbc.c:318977-319016,319067,319071,320879
Propchange: team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 26 03:12:59 2011
@@ -2,4 +2,4 @@
/team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample:319067
/team/irroot/distrotech-customers-trunk/configs/cel_odbc.conf.sample:320619,320821-320822
/team/irroot/t38gateway-1.8/configs/cel_odbc.conf.sample:318979-319017,319357
-/team/irroot/t38gateway-trunk/configs/cel_odbc.conf.sample:318977-319016,319067,319071
+/team/irroot/t38gateway-trunk/configs/cel_odbc.conf.sample:318977-319016,319067,319071,320879
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/iaxfriends.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 26 03:12:59 2011
@@ -1,4 +1,4 @@
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/iaxfriends.sql:319067
/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/iaxfriends.sql:320619,320821-320822
/team/irroot/t38gateway-1.8/contrib/realtime/mysql/iaxfriends.sql:318979-319017,319357
-/team/irroot/t38gateway-trunk/contrib/realtime/mysql/iaxfriends.sql:318977-319016,319067,319071
+/team/irroot/t38gateway-trunk/contrib/realtime/mysql/iaxfriends.sql:318977-319016,319067,319071,320879
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/meetme.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 26 03:12:59 2011
@@ -1,4 +1,4 @@
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/meetme.sql:319067
/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/meetme.sql:320619,320821-320822
/team/irroot/t38gateway-1.8/contrib/realtime/mysql/meetme.sql:318979-319017,319357
-/team/irroot/t38gateway-trunk/contrib/realtime/mysql/meetme.sql:318977-319016,319067,319071
+/team/irroot/t38gateway-trunk/contrib/realtime/mysql/meetme.sql:318977-319016,319067,319071,320879
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/sipfriends.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 26 03:12:59 2011
@@ -1,4 +1,4 @@
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/sipfriends.sql:319067
/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/sipfriends.sql:320619,320821-320822
/team/irroot/t38gateway-1.8/contrib/realtime/mysql/sipfriends.sql:318979-319017,319357
-/team/irroot/t38gateway-trunk/contrib/realtime/mysql/sipfriends.sql:318977-319016,319067,319071
+/team/irroot/t38gateway-trunk/contrib/realtime/mysql/sipfriends.sql:318977-319016,319067,319071,320879
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/voicemail.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 26 03:12:59 2011
@@ -1,4 +1,4 @@
/team/irroot/distrotech-customers-1.8/contrib/realtime/mysql/voicemail.sql:319067
/team/irroot/distrotech-customers-trunk/contrib/realtime/mysql/voicemail.sql:320619,320821-320822
/team/irroot/t38gateway-1.8/contrib/realtime/mysql/voicemail.sql:318979-319017,319357
-/team/irroot/t38gateway-trunk/contrib/realtime/mysql/voicemail.sql:318977-319016,319067,319071
+/team/irroot/t38gateway-trunk/contrib/realtime/mysql/voicemail.sql:318977-319016,319067,319071,320879
Propchange: team/irroot/distrotech-customers-1.8/contrib/realtime/postgresql/realtime.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 26 03:12:59 2011
@@ -1,4 +1,4 @@
/team/irroot/distrotech-customers-1.8/contrib/realtime/postgresql/realtime.sql:319067
/team/irroot/distrotech-customers-trunk/contrib/realtime/postgresql/realtime.sql:320619,320821-320822
/team/irroot/t38gateway-1.8/contrib/realtime/postgresql/realtime.sql:318979-319017,319357
-/team/irroot/t38gateway-trunk/contrib/realtime/postgresql/realtime.sql:318977-319016,319067,319071
+/team/irroot/t38gateway-trunk/contrib/realtime/postgresql/realtime.sql:318977-319016,319067,319071,320879
Modified: team/irroot/distrotech-customers-1.8/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/res/res_fax.c?view=diff&rev=320943&r1=320942&r2=320943
==============================================================================
--- team/irroot/distrotech-customers-1.8/res/res_fax.c (original)
+++ team/irroot/distrotech-customers-1.8/res/res_fax.c Thu May 26 03:12:59 2011
@@ -2814,11 +2814,11 @@
unsigned int orig_read_format = 0;
AST_LIST_HEAD_NOLOCK(, ast_frame) deferred_frames;
- parse = ast_strdupa(data);
-
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(timeout);
);
+
+ parse = ast_strdupa(data);
AST_STANDARD_APP_ARGS(args, parse);
if (args.timeout) {
Modified: team/irroot/distrotech-customers-1.8/res/res_fax_spandsp.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/res/res_fax_spandsp.c?view=diff&rev=320943&r1=320942&r2=320943
==============================================================================
--- team/irroot/distrotech-customers-1.8/res/res_fax_spandsp.c (original)
+++ team/irroot/distrotech-customers-1.8/res/res_fax_spandsp.c Thu May 26 03:12:59 2011
@@ -654,7 +654,7 @@
p->t38_core_state=&p->t38_gw_state.t38x.t38;
#else
/* for spandsp release 0.0.5 */
- p->t38_core_state=&t38_state.t38;
+ p->t38_core_state=&p->t38_gw_state.t38;
#endif
if (! t38_gateway_init(&p->t38_gw_state, t38_tx_packet_handler, p)) {
@@ -700,9 +700,9 @@
#if SPANDSP_RELEASE_DATE >= 20091228
t38_core_send_indicator(&p->t38_gw_state.t38x.t38, T38_IND_NO_SIGNAL);
#elif SPANDSP_RELEASE_DATE >= 20081012
- t38_core_send_indicator(&p->t38_gw_state.t38x.t38, T38_IND_NO_SIGNAL, t38_state.t38x.t38.indicator_tx_count);
+ t38_core_send_indicator(&p->t38_gw_state.t38x.t38, T38_IND_NO_SIGNAL, p->t38_gw_state.t38x.t38.indicator_tx_count);
#else
- t38_core_send_indicator(&t38_state.t38, T38_IND_NO_SIGNAL, t38_state.t38.indicator_tx_count);
+ t38_core_send_indicator(&p->t38_gw_state.t38, T38_IND_NO_SIGNAL, p->t38_gw_state.t38.indicator_tx_count);
#endif
}
More information about the svn-commits
mailing list