diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-01 01:34:45 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-01 01:34:45 +0000 |
commit | c907295f9a8f33a682d9ce57136df4116b43d888 (patch) | |
tree | 0f848066fd29b8c9ccbe1ce9cb6c07f214f8fd89 /main | |
parent | d28dafe2a434e6d06c9f7ca53873ff7e8b12f975 (diff) |
Merged revisions 209760-209761 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r209760 | kpfleming | 2009-07-31 20:03:07 -0500 (Fri, 31 Jul 2009) | 13 lines
Merged revisions 209759 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r209759 | kpfleming | 2009-07-31 19:52:00 -0500 (Fri, 31 Jul 2009) | 7 lines
Minor changes inspired by testing with latest GCC.
The latest GCC (what will become 4.5.x) has a few new warnings, that in these
cases found some either downright buggy code, or at least seriously poorly
designed code that could be improved.
........
................
r209761 | kpfleming | 2009-07-31 20:04:06 -0500 (Fri, 31 Jul 2009) | 1 line
Revert accidental Makefile change.
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@209816 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/Makefile | 2 | ||||
-rw-r--r-- | main/pbx.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/main/Makefile b/main/Makefile index 17aa6e173..53c83a0ab 100644 --- a/main/Makefile +++ b/main/Makefile @@ -110,7 +110,7 @@ editline/libedit.a: CHECK_SUBDIR $(MAKE) -C editline libedit.a db1-ast/libdb1.a: CHECK_SUBDIR - CFLAGS="$(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS) $(ASTCFLAGS))" LDFLAGS="$(ASTLDFLAGS)" $(MAKE) -C db1-ast libdb1.a + _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a ast_expr2.c ast_expr2.h: bison -o $@ -d --name-prefix=ast_yy ast_expr2.y diff --git a/main/pbx.c b/main/pbx.c index a85105d64..ed1084886 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -1345,7 +1345,7 @@ int pbx_exec(struct ast_channel *c, /*!< Channel */ "the pipe. Did you forget to convert your dialplan? (%s(%s))\n", app->name, (char *) data); } - res = app->execute(c, S_OR(data, "")); + res = app->execute(c, S_OR((char *) data, "")); if (app->module && u) __ast_module_user_remove(app->module, u); /* restore channel values */ |