diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-12-11 10:47:06 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-12-11 10:47:06 -0600 |
| commit | c421d786d4a34b31cbe35eef485b8f2b8f652629 (patch) | |
| tree | 9fd5c5a4f025b6423714d23070739cf13514119f | |
| parent | 75af0af465c4409844b151ea84a606345236b01d (diff) | |
| parent | 95a90bdca1c9e9f5af8bba9d55e55749d44aae98 (diff) | |
Merge "res_stasis and res_speech: Fix load order." into 15
| -rw-r--r-- | res/res_speech.c | 2 | ||||
| -rw-r--r-- | res/res_stasis.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/res/res_speech.c b/res/res_speech.c index d6c532971..31ad61acb 100644 --- a/res/res_speech.c +++ b/res/res_speech.c @@ -363,5 +363,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ .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 f99dcee37..42a19bf56 100644 --- a/res/res_stasis.c +++ b/res/res_stasis.c @@ -2155,8 +2155,8 @@ static int load_module(void) 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, |