diff options
author | David M. Lee <dlee@digium.com> | 2013-03-22 19:26:37 +0000 |
---|---|---|
committer | David M. Lee <dlee@digium.com> | 2013-03-22 19:26:37 +0000 |
commit | cfd2b244f7afbe828a2d6b80d680009d7cfbd05c (patch) | |
tree | c82e5c2e79e03fe1aeda2c9f137c047c87c11a2d /main/asterisk.c | |
parent | cf9324b25eb8a7dc5cef77f54e12758dfbcd6645 (diff) |
Corrected some module issues introduced by r383579.
When I moved res_json.c to json.c, I left the MODULE_INFO stuff in there,
which was interesting if you ran module show. I also forgot to call what
was in module_load() from asterisk main().
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@383611 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/asterisk.c')
-rw-r--r-- | main/asterisk.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 3a0e87c41..d7eb8d953 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -241,6 +241,7 @@ int daemon(int, int); /* defined in libresolv of all places */ #include "asterisk/uuid.h" #include "asterisk/sorcery.h" #include "asterisk/stasis.h" +#include "asterisk/json.h" #include "../defaults.h" @@ -4070,6 +4071,7 @@ int main(int argc, char *argv[]) ast_el_read_history(filename); } + ast_json_init(); ast_ulaw_init(); ast_alaw_init(); tdd_init(); |