diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-31 18:43:59 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-31 18:43:59 +0000 |
| commit | a78e6cd4e9fd9db542f35fa6381022e859775d4d (patch) | |
| tree | 1d231e0da7e08c9f7926487547c0290431477c36 | |
| parent | a7037d38cbc068cd098615f35dc9bce8c2a0da6f (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: http://svn.digium.com/svn/asterisk/trunk@66776 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 | 4 |
3 files changed, 4 insertions, 4 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 */ diff --git a/res/res_speech.c b/res/res_speech.c index 9957c221d..960c7f42c 100644 --- a/res/res_speech.c +++ b/res/res_speech.c @@ -185,7 +185,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; @@ -251,7 +251,7 @@ int ast_speech_register(struct ast_speech_engine *engine) int res = 0; /* Confirm the engine meets the minimum API requirements */ - if (!engine->new || !engine->write || !engine->destroy) { + if (!engine->create || !engine->write || !engine->destroy) { ast_log(LOG_WARNING, "Speech recognition engine '%s' did not meet minimum API requirements.\n", engine->name); return -1; } |