[svn-commits] dlee: branch dlee/stasis-app r381793 - in /team/dlee/stasis-app: apps/ res/ t...

[SVN commits to the Digium repositories]

Author: dlee
Date: Tue Feb 19 13:47:46 2013
New Revision: 381793

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=381793
Log:
Fixed load order issues

Modified:
    team/dlee/stasis-app/apps/app_stasis.c
    team/dlee/stasis-app/res/res_stasis_websocket.c
    team/dlee/stasis-app/tests/test_app_stasis.c

Modified: team/dlee/stasis-app/apps/app_stasis.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-app/apps/app_stasis.c?view=diff&rev=381793&r1=381792&r2=381793
==============================================================================
--- team/dlee/stasis-app/apps/app_stasis.c (original)
+++ team/dlee/stasis-app/apps/app_stasis.c Tue Feb 19 13:47:46 2013
@@ -426,7 +426,7 @@
 	return r;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis dialplan application",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis dialplan application",
 		.load = load_module,
 		.unload = unload_module,
 		.nonoptreq = "res_json");

Modified: team/dlee/stasis-app/res/res_stasis_websocket.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-app/res/res_stasis_websocket.c?view=diff&rev=381793&r1=381792&r2=381793
==============================================================================
--- team/dlee/stasis-app/res/res_stasis_websocket.c (original)
+++ team/dlee/stasis-app/res/res_stasis_websocket.c Tue Feb 19 13:47:46 2013
@@ -295,7 +295,7 @@
 	return r;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Stasis HTTP bindings",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, 0, "Stasis HTTP bindings",
                 .load = load_module,
                 .unload = unload_module,
                 .nonoptreq = "app_stasis,res_http_websocket,res_json"

Modified: team/dlee/stasis-app/tests/test_app_stasis.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-app/tests/test_app_stasis.c?view=diff&rev=381793&r1=381792&r2=381793
==============================================================================
--- team/dlee/stasis-app/tests/test_app_stasis.c (original)
+++ team/dlee/stasis-app/tests/test_app_stasis.c Tue Feb 19 13:47:46 2013
@@ -181,7 +181,7 @@
 	return AST_MODULE_LOAD_SUCCESS;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Stasis Core testing",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, 0, "Stasis Core testing",
 		.load = load_module,
 		.unload = unload_module,
 		.nonoptreq = "app_stasis"