diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-31 18:41:58 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-31 18:41:58 +0000 |
| commit | 3e13702d65b9c53a5b9c35abc670cef3fa1ee6ee (patch) | |
| tree | dc98bad7f6c9235177cd0038b8920ce4d57ce19a | |
| parent | c096054af4eff333cac67ebdac538fdc4dc49a34 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.4@66775 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | include/asterisk/app.h | 2 | ||||
| -rw-r--r-- | include/asterisk/speech.h | 2 | ||||
| -rw-r--r-- | res/res_speech.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/asterisk/app.h b/include/asterisk/app.h index 1c6dca0e7..fc0536e06 100644 --- a/include/asterisk/app.h +++ b/include/asterisk/app.h @@ -226,7 +226,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 09d08ddb1..3af01e614 100644 --- a/include/asterisk/speech.h +++ b/include/asterisk/speech.h @@ -69,7 +69,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 */ diff --git a/res/res_speech.c b/res/res_speech.c index 419c6086e..16673538b 100644 --- a/res/res_speech.c +++ b/res/res_speech.c @@ -237,7 +237,7 @@ struct ast_speech *ast_speech_new(char *engine_name, int format) ast_speech_change_state(new_speech, AST_SPEECH_STATE_NOT_READY); /* Pass ourselves to the engine so they can set us up some more and if they error out then do not create a structure */ - if (engine->new(new_speech)) { + if (engine->create(new_speech)) { ast_mutex_destroy(&new_speech->lock); free(new_speech); new_speech = NULL; |