[Asterisk-code-review] res stasis and res speech: Fix load order. (asterisk[15])

Jenkins2 asteriskteam at digium.com
Mon Dec 11 10:47:07 CST 2017


Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/7491 )

Change subject: res_stasis and res_speech: Fix load order.
......................................................................

res_stasis and res_speech: Fix load order.

res_stasis was missing AST_MODFLAG_LOAD_ORDER.  Set res_stasis and
res_speech to start at (AST_MODPRI_APP_DEPEND - 1) so they are ready for
dependent modules.

Change-Id: I27f4f3810a95b6be8a5bfbf62be2ace6bfab6ff3
---
M res/res_speech.c
M res/res_stasis.c
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  Sean Bright: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Jenkins2: Approved for Submit



diff --git a/res/res_speech.c b/res/res_speech.c
index d6c5329..31ad61a 100644
--- a/res/res_speech.c
+++ b/res/res_speech.c
@@ -363,5 +363,5 @@
 	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
-	.load_pri = AST_MODPRI_APP_DEPEND,
+	.load_pri = AST_MODPRI_APP_DEPEND - 1,
 );
diff --git a/res/res_stasis.c b/res/res_stasis.c
index f99dcee..42a19bf 100644
--- a/res/res_stasis.c
+++ b/res/res_stasis.c
@@ -2155,8 +2155,8 @@
 	return AST_MODULE_LOAD_SUCCESS;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis application support",
-	.load_pri = AST_MODPRI_APP_DEPEND,
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis application support",
+	.load_pri = AST_MODPRI_APP_DEPEND - 1,
 	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,

-- 
To view, visit https://gerrit.asterisk.org/7491
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 15
Gerrit-MessageType: merged
Gerrit-Change-Id: I27f4f3810a95b6be8a5bfbf62be2ace6bfab6ff3
Gerrit-Change-Number: 7491
Gerrit-PatchSet: 1
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Sean Bright <sean.bright at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20171211/1347cdc1/attachment-0001.html>


More information about the asterisk-code-review mailing list