[svn-commits] rmudgett: branch group/issue14292 r199135 - /team/group/issue14292/channels/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Thu Jun  4 13:29:01 2009
New Revision: 199135

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=199135
Log:
Fixed compiler errors from libpri API change.

Modified:
    team/group/issue14292/channels/chan_dahdi.c

Modified: team/group/issue14292/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/issue14292/channels/chan_dahdi.c?view=diff&rev=199135&r1=199134&r2=199135
==============================================================================
--- team/group/issue14292/channels/chan_dahdi.c (original)
+++ team/group/issue14292/channels/chan_dahdi.c Thu Jun  4 13:29:01 2009
@@ -14321,8 +14321,8 @@
 			}
 			break;
 		case PRI_SUBCMD_CC_CCBSREQUEST_RR:
-			no_path_reservation = subcmd->cc_ccbs_rr.cc_request_res.no_path_reservation;
-			retain_service = subcmd->cc_ccbs_rr.cc_request_res.retain_service;
+			no_path_reservation = subcmd->u.cc_ccbs_rr.cc_request_res.no_path_reservation;
+			retain_service = subcmd->u.cc_ccbs_rr.cc_request_res.retain_service;
 
 			ast_verb(4,
 				"ccbs-request RR no-path-reservation '%d' retain-service '%d' on channel %d/%d on span %d\n",
@@ -14354,8 +14354,8 @@
 			}
 			break;
 		case PRI_SUBCMD_CC_CCNRREQUEST_RR:
-			no_path_reservation = subcmd->cc_ccnr_rr.cc_request_res.no_path_reservation;
-			retain_service = subcmd->cc_ccnr_rr.cc_request_res.retain_service;
+			no_path_reservation = subcmd->u.cc_ccnr_rr.cc_request_res.no_path_reservation;
+			retain_service = subcmd->u.cc_ccnr_rr.cc_request_res.retain_service;
 
 			ast_verb(3,
 				"ccnr-request RR no-path-reservation '%d' retain-service '%d' on channel %d/%d on span %d\n",
@@ -14386,14 +14386,14 @@
 		case PRI_SUBCMD_CC_ERROR:
 			ast_verb(4,
 				"cc-error RR value '%d' on channel %d/%d on span %d\n",
-				subcmd->cc_error.error_value, PRI_SPAN(channel), PRI_CHANNEL(channel),
+				subcmd->u.cc_error.error_value, PRI_SPAN(channel), PRI_CHANNEL(channel),
 				pri->span);
 			break;
 		case PRI_SUBCMD_CC_CANCEL_INV:
 			ast_verb(4,
 				"cc-cancel INV numberA '%s' numberB '%s' on channel %d/%d on span %d\n",
-				subcmd->cc_cancel_inv.cc_optional_arg.number_A,
-				subcmd->cc_cancel_inv.cc_optional_arg.number_B,
+				subcmd->u.cc_cancel_inv.cc_optional_arg.number_A,
+				subcmd->u.cc_cancel_inv.cc_optional_arg.number_B,
 				PRI_SPAN(channel), PRI_CHANNEL(channel), pri->span);
 			break;
 		default: