[asterisk-commits] irroot: branch irroot/distrotech-customers-trunk r320941 - in /team/irroot/di...

[SVN commits to the Asterisk project]

Author: irroot
Date: Thu May 26 01:43:26 2011
New Revision: 320941

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=320941
Log:
Compat Changes h/t mnicholson

Modified:
    team/irroot/distrotech-customers-trunk/   (props changed)
    team/irroot/distrotech-customers-trunk/cel/cel_odbc.c   (props changed)
    team/irroot/distrotech-customers-trunk/configs/cel_odbc.conf.sample   (props changed)
    team/irroot/distrotech-customers-trunk/res/res_fax.c
    team/irroot/distrotech-customers-trunk/res/res_fax_spandsp.c
    team/irroot/distrotech-customers-trunk/sounds/Makefile   (props changed)

Propchange: team/irroot/distrotech-customers-trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 26 01:43:26 2011
@@ -1,4 +1,4 @@
 /team/irroot/app_queue-trunk:318983-319002
 /team/irroot/distrotech-customers:318992-318995,318997-319000
 /team/irroot/distrotech-customers-1.8:319062,319075
-/team/irroot/t38gateway-trunk:318974-319016,319064,319067,319071
+/team/irroot/t38gateway-trunk:318974-319016,319064,319067,319071,320879

Propchange: team/irroot/distrotech-customers-trunk/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 26 01:43:26 2011
@@ -2,4 +2,4 @@
 /team/irroot/app_queue-trunk/cel/cel_odbc.c:318983-319002
 /team/irroot/distrotech-customers/cel/cel_odbc.c:318992-319000
 /team/irroot/distrotech-customers-1.8/cel/cel_odbc.c:319062,319075
-/team/irroot/t38gateway-trunk/cel/cel_odbc.c:318974-319016,319064,319067,319071,319361
+/team/irroot/t38gateway-trunk/cel/cel_odbc.c:318974-319016,319064,319067,319071,319361,320879

Propchange: team/irroot/distrotech-customers-trunk/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 26 01:43:26 2011
@@ -2,4 +2,4 @@
 /team/irroot/app_queue-trunk/configs/cel_odbc.conf.sample:318983-319002
 /team/irroot/distrotech-customers/configs/cel_odbc.conf.sample:318992-319000
 /team/irroot/distrotech-customers-1.8/configs/cel_odbc.conf.sample:319062,319075
-/team/irroot/t38gateway-trunk/configs/cel_odbc.conf.sample:318974-319016,319064,319067,319071,319361
+/team/irroot/t38gateway-trunk/configs/cel_odbc.conf.sample:318974-319016,319064,319067,319071,319361,320879

Modified: team/irroot/distrotech-customers-trunk/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/res/res_fax.c?view=diff&rev=320941&r1=320940&r2=320941
==============================================================================
--- team/irroot/distrotech-customers-trunk/res/res_fax.c (original)
+++ team/irroot/distrotech-customers-trunk/res/res_fax.c Thu May 26 01:43:26 2011
@@ -2749,11 +2749,11 @@
 	struct ast_format orig_read_format;
 	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-trunk/res/res_fax_spandsp.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/res/res_fax_spandsp.c?view=diff&rev=320941&r1=320940&r2=320941
==============================================================================
--- team/irroot/distrotech-customers-trunk/res/res_fax_spandsp.c (original)
+++ team/irroot/distrotech-customers-trunk/res/res_fax_spandsp.c Thu May 26 01:43:26 2011
@@ -653,7 +653,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)) {
@@ -699,9 +699,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
 	}
 

Propchange: team/irroot/distrotech-customers-trunk/sounds/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 26 01:43:26 2011
@@ -2,4 +2,4 @@
 /team/irroot/app_queue-trunk/sounds/Makefile:318983-319002
 /team/irroot/distrotech-customers/sounds/Makefile:318992-319000
 /team/irroot/distrotech-customers-1.8/sounds/Makefile:319062,319075
-/team/irroot/t38gateway-trunk/sounds/Makefile:318974-319016,319064,319067,319071,319361
+/team/irroot/t38gateway-trunk/sounds/Makefile:318974-319016,319064,319067,319071,319361,320879