diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2008-06-29 16:19:29 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-06-29 16:19:29 +0000 |
| commit | 71b3fd1ef76db430faddc3442c3db80b0d5b5ef5 (patch) | |
| tree | 6c2d79efb3af9b3b26ee1680c365bf63b9cbe150 /pbx | |
| parent | a61f8794e398adc2082ca48f79b2143170d23265 (diff) | |
various minor fixes created while i worked on getting *every* Asterisk module to build on laptop in dev mode:
remove weird pre-setting of LUA paths; they are not necessary; also use the proper path for including the files in pbx_lua.c
add searching for OpenAIS libraries in /usr/lib/openais if a path is not specified; not sure if this is really the optimal solution, but it works
make the compiler shut up about some ignored function results in pbx_gtkconsole; this module is badly coded anyway
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@126356 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx')
| -rw-r--r-- | pbx/Makefile | 2 | ||||
| -rw-r--r-- | pbx/pbx_gtkconsole.c | 8 | ||||
| -rw-r--r-- | pbx/pbx_lua.c | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/pbx/Makefile b/pbx/Makefile index 731057b1d..368f6f15a 100644 --- a/pbx/Makefile +++ b/pbx/Makefile @@ -29,4 +29,6 @@ clean:: dundi-parser.o: dundi-parser.h dundi-parser.o: ASTCFLAGS+=-I. +pbx_gtkconsole.o: ASTCFLAGS+=-Wno-strict-prototypes + $(if $(filter pbx_dundi,$(EMBEDDED_MODS)),modules.link,pbx_dundi.so): dundi-parser.o diff --git a/pbx/pbx_gtkconsole.c b/pbx/pbx_gtkconsole.c index a12e139bb..b7846d3ba 100644 --- a/pbx/pbx_gtkconsole.c +++ b/pbx/pbx_gtkconsole.c @@ -307,11 +307,13 @@ static int mod_update(void) static void exit_now(GtkWidget *widget, gpointer data) { + int res; + ast_loader_unregister(mod_update); gtk_main_quit(); inuse--; ast_update_use_count(); - ast_unregister_verbose(verboser); + res = ast_unregister_verbose(verboser); ast_unload_resource("pbx_gtkconsole", 0); ast_verb(2, "GTK Console Monitor Exiting\n"); /* XXX Trying to quit after calling this makes asterisk segfault XXX */ @@ -361,6 +363,8 @@ static int show_console(void) GtkWidget *sw; GtkWidget *bbox, *hbbox, *add, *removew, *reloadw; char *modtitles[3] = { "Module", "Description", "Use Count" }; + int res; + window = gtk_window_new(GTK_WINDOW_TOPLEVEL); statusbar = gtk_statusbar_new(); @@ -465,7 +469,7 @@ static int show_console(void) ast_pthread_create(&console_thread, NULL, consolethread, NULL); /* XXX Okay, seriously fix me! XXX */ usleep(100000); - ast_register_verbose(verboser); + res = ast_register_verbose(verboser); gtk_clist_freeze(GTK_CLIST(verb)); ast_loader_register(mod_update); gtk_clist_thaw(GTK_CLIST(verb)); diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c index 6302ac655..704d811de 100644 --- a/pbx/pbx_lua.c +++ b/pbx/pbx_lua.c @@ -41,9 +41,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/term.h" #include "asterisk/paths.h" -#include <lua.h> -#include <lauxlib.h> -#include <lualib.h> +#include <lua5.1/lua.h> +#include <lua5.1/lauxlib.h> +#include <lua5.1/lualib.h> static char *config = "extensions.lua"; |