diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-12-11 10:39:36 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-12-11 10:39:36 -0600 |
| commit | 8834a8eff95a1f9b1070820d58a810e8e88d5d8d (patch) | |
| tree | bbe9fb5c7cbf9dfdc5fcb0edf97b928df7ad03b6 /res | |
| parent | 90fe599e45567390d435e31d234f9473ffe8c939 (diff) | |
| parent | 3d79c34350b9cadd5be274218907411329032a21 (diff) | |
Merge "res_stasis and res_speech: Fix load order." into 13
Diffstat (limited to 'res')
| -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 7d75985ca..f61588f57 100644 --- a/res/res_speech.c +++ b/res/res_speech.c @@ -365,5 +365,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 b1cea3ad5..9a06a5287 100644 --- a/res/res_stasis.c +++ b/res/res_stasis.c @@ -2124,8 +2124,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, |