[asterisk-commits] file: trunk r65233 - in /trunk: main/Makefile main/adsistub.c res/res_adsi.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Sun May 20 09:48:31 2007
New Revision: 65233

URL: http://svn.digium.com/view/asterisk?view=rev&rev=65233
Log:
Add the adsistub file to the Asterisk makefile, fix a stub definition, and no longer make the symbols from res_adsi global since they don't need to be.

Modified:
    trunk/main/Makefile
    trunk/main/adsistub.c
    trunk/res/res_adsi.c

Modified: trunk/main/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/main/Makefile?view=diff&rev=65233&r1=65232&r2=65233
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Sun May 20 09:48:31 2007
@@ -26,7 +26,7 @@
 	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

Modified: trunk/main/adsistub.c
URL: http://svn.digium.com/view/asterisk/trunk/main/adsistub.c?view=diff&rev=65233&r1=65232&r2=65233
==============================================================================
--- trunk/main/adsistub.c (original)
+++ trunk/main/adsistub.c Sun May 20 09:48:31 2007
@@ -77,7 +77,7 @@
 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)

Modified: trunk/res/res_adsi.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_adsi.c?view=diff&rev=65233&r1=65232&r2=65233
==============================================================================
--- trunk/res/res_adsi.c (original)
+++ trunk/res/res_adsi.c Sun May 20 09:48:31 2007
@@ -1175,7 +1175,7 @@
 	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,