[asterisk-commits] mjordan: trunk r395381 - in /trunk: main/ res/ res/stasis_http/ tests/

[SVN commits to the Asterisk project]

Author: mjordan
Date: Wed Jul 24 23:18:05 2013
New Revision: 395381

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395381
Log:
Fix incorrect reference to stasis/bridging.h

Modified:
    trunk/main/cdr.c
    trunk/main/cli.c
    trunk/main/manager.c
    trunk/main/manager_bridges.c
    trunk/main/stasis_bridges.c
    trunk/res/res_stasis.c
    trunk/res/stasis_http/resource_bridges.c
    trunk/tests/test_cdr.c
    trunk/tests/test_cel.c

Modified: trunk/main/cdr.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/cdr.c?view=diff&rev=395381&r1=395380&r2=395381
==============================================================================
--- trunk/main/cdr.c (original)
+++ trunk/main/cdr.c Wed Jul 24 23:18:05 2013
@@ -68,7 +68,7 @@
 #include "asterisk/parking.h"
 #include "asterisk/stasis.h"
 #include "asterisk/stasis_channels.h"
-#include "asterisk/stasis_bridging.h"
+#include "asterisk/stasis_bridges.h"
 #include "asterisk/stasis_message_router.h"
 #include "asterisk/astobj2.h"
 

Modified: trunk/main/cli.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/cli.c?view=diff&rev=395381&r1=395380&r2=395381
==============================================================================
--- trunk/main/cli.c (original)
+++ trunk/main/cli.c Wed Jul 24 23:18:05 2013
@@ -62,7 +62,7 @@
 #include "asterisk/translate.h"
 #include "asterisk/bridge.h"
 #include "asterisk/stasis_channels.h"
-#include "asterisk/stasis_bridging.h"
+#include "asterisk/stasis_bridges.h"
 
 /*!
  * \brief List of restrictions per user.

Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=395381&r1=395380&r2=395381
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Wed Jul 24 23:18:05 2013
@@ -94,7 +94,7 @@
 #include "asterisk/presencestate.h"
 #include "asterisk/stasis_message_router.h"
 #include "asterisk/stasis_channels.h"
-#include "asterisk/stasis_bridging.h"
+#include "asterisk/stasis_bridges.h"
 #include "asterisk/test.h"
 #include "asterisk/json.h"
 #include "asterisk/bridge.h"

Modified: trunk/main/manager_bridges.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager_bridges.c?view=diff&rev=395381&r1=395380&r2=395381
==============================================================================
--- trunk/main/manager_bridges.c (original)
+++ trunk/main/manager_bridges.c Wed Jul 24 23:18:05 2013
@@ -27,7 +27,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include "asterisk/stasis_bridging.h"
+#include "asterisk/stasis_bridges.h"
 #include "asterisk/stasis_channels.h"
 #include "asterisk/manager.h"
 #include "asterisk/stasis_message_router.h"

Modified: trunk/main/stasis_bridges.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/stasis_bridges.c?view=diff&rev=395381&r1=395380&r2=395381
==============================================================================
--- trunk/main/stasis_bridges.c (original)
+++ trunk/main/stasis_bridges.c Wed Jul 24 23:18:05 2013
@@ -34,7 +34,7 @@
 #include "asterisk/astobj2.h"
 #include "asterisk/stasis.h"
 #include "asterisk/channel.h"
-#include "asterisk/stasis_bridging.h"
+#include "asterisk/stasis_bridges.h"
 #include "asterisk/stasis_channels.h"
 #include "asterisk/bridge.h"
 #include "asterisk/bridge_technology.h"

Modified: trunk/res/res_stasis.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_stasis.c?view=diff&rev=395381&r1=395380&r2=395381
==============================================================================
--- trunk/res/res_stasis.c (original)
+++ trunk/res/res_stasis.c Wed Jul 24 23:18:05 2013
@@ -60,7 +60,7 @@
 #include "asterisk/module.h"
 #include "asterisk/stasis_app_impl.h"
 #include "asterisk/stasis_channels.h"
-#include "asterisk/stasis_bridging.h"
+#include "asterisk/stasis_bridges.h"
 #include "asterisk/stasis_message_router.h"
 #include "asterisk/strings.h"
 #include "stasis/app.h"

Modified: trunk/res/stasis_http/resource_bridges.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/stasis_http/resource_bridges.c?view=diff&rev=395381&r1=395380&r2=395381
==============================================================================
--- trunk/res/stasis_http/resource_bridges.c (original)
+++ trunk/res/stasis_http/resource_bridges.c Wed Jul 24 23:18:05 2013
@@ -33,7 +33,7 @@
 
 #include "resource_bridges.h"
 #include "asterisk/stasis.h"
-#include "asterisk/stasis_bridging.h"
+#include "asterisk/stasis_bridges.h"
 #include "asterisk/stasis_app.h"
 #include "asterisk/stasis_app_playback.h"
 #include "asterisk/stasis_app_recording.h"

Modified: trunk/tests/test_cdr.c
URL: http://svnview.digium.com/svn/asterisk/trunk/tests/test_cdr.c?view=diff&rev=395381&r1=395380&r2=395381
==============================================================================
--- trunk/tests/test_cdr.c (original)
+++ trunk/tests/test_cdr.c Wed Jul 24 23:18:05 2013
@@ -45,7 +45,7 @@
 #include "asterisk/bridge.h"
 #include "asterisk/bridge_basic.h"
 #include "asterisk/stasis_channels.h"
-#include "asterisk/stasis_bridging.h"
+#include "asterisk/stasis_bridges.h"
 
 #define EPSILON 0.001
 

Modified: trunk/tests/test_cel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/tests/test_cel.c?view=diff&rev=395381&r1=395380&r2=395381
==============================================================================
--- trunk/tests/test_cel.c (original)
+++ trunk/tests/test_cel.c Wed Jul 24 23:18:05 2013
@@ -46,7 +46,7 @@
 #include "asterisk/bridge.h"
 #include "asterisk/bridge_basic.h"
 #include "asterisk/stasis_channels.h"
-#include "asterisk/stasis_bridging.h"
+#include "asterisk/stasis_bridges.h"
 #include "asterisk/json.h"
 #include "asterisk/features.h"
 #include "asterisk/core_local.h"