kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-18 18:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@23927 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-05-01 11:04:46 +00:00
parent 8192165970
commit ab900f7fad
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app_skel.c
View File

@@ -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_C (1 << 2) /* Option C(str) */
#define OPTION_NULL (1 << 3) /* Dummy Termination */ #define OPTION_NULL (1 << 3) /* Dummy Termination */
AST_DECLARE_OPTIONS(app_opts,{ AST_APP_OPTIONS(app_opts,{
['a'] = { OPTION_A }, ['a'] = { OPTION_A },
['b'] = { OPTION_B, 1 }, ['b'] = { OPTION_B, 1 },
['c'] = { OPTION_C, 2 } ['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])))) { if ((argc = ast_app_separate_args(args, '|', argv, sizeof(argv) / sizeof(argv[0])))) {
dummy = argv[0]; dummy = argv[0];
options = argv[1]; options = argv[1];
ast_parseoptions(app_opts, &flags, opts, options); ast_app_parse_options(app_opts, &flags, opts, options);
} }
if (!ast_strlen_zero(dummy)) if (!ast_strlen_zero(dummy))

1
cdr/cdr_sqlite.c
View File

@@ -33,6 +33,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>