diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-12 22:58:49 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-12 22:58:49 +0000 |
| commit | 41df2e668668137091861464cabe91cf110f4302 (patch) | |
| tree | 921cb941ba1a59df6cc1650b935d249fa0b73f84 /include | |
| parent | 476ed07a1111e6172eb4f860ad239d3ef7bb5f49 (diff) | |
manual update, since automerge is not running at this time
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@48421 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/channel.h | 1 | ||||
| -rw-r--r-- | include/asterisk/config.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 38b33ed2d..dd78844c9 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -435,6 +435,7 @@ struct ast_channel { so when ->priority is set, it will get incremented before finding the next priority to run */ +#define AST_FLAG_NOTNEW (1 << 10) /*!< see bug:7855 incorrect Newchannel event generation */ /* @} */ #define AST_FEATURE_PLAY_WARNING (1 << 0) diff --git a/include/asterisk/config.h b/include/asterisk/config.h index aa639aaae..142055509 100644 --- a/include/asterisk/config.h +++ b/include/asterisk/config.h @@ -181,7 +181,6 @@ void ast_category_rename(struct ast_category *cat, const char *name); struct ast_variable *ast_variable_new(const char *name, const char *value); void ast_variable_append(struct ast_category *category, struct ast_variable *variable); -int ast_variable_delete(struct ast_config *cfg, char *category, char *variable, char *value); int config_text_file_save(const char *filename, const struct ast_config *cfg, const char *generator); |