diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-01 11:04:46 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-01 11:04:46 +0000 |
| commit | b6b4c507170f7585715ba67b1628c995da94280e (patch) | |
| tree | d3af2dfd6c9145f5e5d3c1b110631b9a5aab5826 | |
| parent | 1ea7befd4dec2b18094945c5d9c404c40a2d5a67 (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@23927 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_skel.c | 4 | ||||
| -rw-r--r-- | cdr/cdr_sqlite.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/app_skel.c b/apps/app_skel.c index 9fb2e757a..46e94afb4 100644 --- a/apps/app_skel.c +++ b/apps/app_skel.c @@ -53,7 +53,7 @@ static char *descrip = "This application is a template to build other applicatio #define OPTION_C (1 << 2) /* Option C(str) */ #define OPTION_NULL (1 << 3) /* Dummy Termination */ -AST_DECLARE_OPTIONS(app_opts,{ +AST_APP_OPTIONS(app_opts,{ ['a'] = { OPTION_A }, ['b'] = { OPTION_B, 1 }, ['c'] = { OPTION_C, 2 } @@ -95,7 +95,7 @@ static int app_exec(struct ast_channel *chan, void *data) if ((argc = ast_app_separate_args(args, '|', argv, sizeof(argv) / sizeof(argv[0])))) { dummy = argv[0]; options = argv[1]; - ast_parseoptions(app_opts, &flags, opts, options); + ast_app_parse_options(app_opts, &flags, opts, options); } if (!ast_strlen_zero(dummy)) diff --git a/cdr/cdr_sqlite.c b/cdr/cdr_sqlite.c index 33410229f..c6e68acb7 100644 --- a/cdr/cdr_sqlite.c +++ b/cdr/cdr_sqlite.c @@ -33,6 +33,7 @@ #include <sys/types.h> +#include <stdio.h> #include <unistd.h> #include <string.h> #include <stdlib.h> |