Add the adsistub file to the Asterisk makefile, fix a stub definition, and no longer...
authorJoshua Colp <jcolp@digium.com>
Sun, 20 May 2007 14:48:31 +0000 (14:48 +0000)
committerJoshua Colp <jcolp@digium.com>
Sun, 20 May 2007 14:48:31 +0000 (14:48 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65233 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/Makefile
main/adsistub.c
res/res_adsi.c

index 2ea8096..c079a98 100644 (file)
@@ -26,7 +26,7 @@ OBJS= io.o sched.o logger.o frame.o loader.o config.o channel.o \
        utils.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
        netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
        cryptostub.o sha1.o http.o fixedjitterbuf.o abstract_jb.o \
-       strcompat.o threadstorage.o dial.o event.o
+       strcompat.o threadstorage.o dial.o event.o adsistub.o
 
 # we need to link in the objects statically, not as a library, because
 # otherwise modules will not have them available if none of the static
index 2b065be..232b9e0 100644 (file)
@@ -77,7 +77,7 @@ build_stub(ast_adsi_voice_mode,unsigned char *buf, int when)
 build_stub(ast_adsi_available,struct ast_channel *chan)
 build_stub(ast_adsi_display,unsigned char *buf, int page, int line, int just, int wrap, char *col1, char *col2)
 build_stub(ast_adsi_set_line,unsigned char *buf, int page, int line)
-build_stub(ast_adsi_load_soft_key,unsigned char *buf, int key, char *llabel, char *slabel, char *ret, int data)
+build_stub(ast_adsi_load_soft_key,unsigned char *buf, int key, const char *llabel, const char *slabel, char *ret, int data)
 build_stub(ast_adsi_set_keys,unsigned char *buf, unsigned char *keys)
 build_stub(ast_adsi_input_control,unsigned char *buf, int page, int line, int display, int format, int just)
 build_stub(ast_adsi_input_format,unsigned char *buf, int num, int dir, int wrap, char *format1, char *format2)
index 97ce901..6b3fccf 100644 (file)
@@ -1175,7 +1175,7 @@ static int unload_module(void)
        return -1;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "ADSI Resource",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ADSI Resource",
                .load = load_module,
                .unload = unload_module,
                .reload = reload,