diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-05-31 18:43:59 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-05-31 18:43:59 +0000 |
| commit | ce4051a80378d70c9a55a1530844e3d6525ac78e (patch) | |
| tree | 1d231e0da7e08c9f7926487547c0290431477c36 /include | |
| parent | 8d0124aba37e6a614803f76cae4170815d82adf7 (diff) | |
Merged revisions 66775 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r66775 | russell | 2007-05-31 13:41:58 -0500 (Thu, 31 May 2007) | 3 lines
Change a couple of header files to not use "new", which is a reserved keyword
in C++. (issue #9830, reported by osk)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66776 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/app.h | 2 | ||||
| -rw-r--r-- | include/asterisk/speech.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/app.h b/include/asterisk/app.h index b8a989063..c60219b85 100644 --- a/include/asterisk/app.h +++ b/include/asterisk/app.h @@ -228,7 +228,7 @@ int ast_app_group_match_get_count(const char *groupmatch, const char *category); int ast_app_group_discard(struct ast_channel *chan); /*! Update all group counting for a channel to a new one */ -int ast_app_group_update(struct ast_channel *old, struct ast_channel *new); +int ast_app_group_update(struct ast_channel *oldchan, struct ast_channel *newchan); /*! Lock the group count list */ int ast_app_group_list_lock(void); diff --git a/include/asterisk/speech.h b/include/asterisk/speech.h index 95f667d7e..260e5ed5d 100644 --- a/include/asterisk/speech.h +++ b/include/asterisk/speech.h @@ -73,7 +73,7 @@ struct ast_speech_engine { /*! Name of speech engine */ char *name; /*! Set up the speech structure within the engine */ - int (*new)(struct ast_speech *speech); + int (*create)(struct ast_speech *speech); /*! Destroy any data set on the speech structure by the engine */ int (*destroy)(struct ast_speech *speech); /*! Load a local grammar on the speech structure */ |