kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 66775 via svnmerge from

Browse Source 
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
This commit is contained in:
Russell Bryant
2007-05-31 18:43:59 +00:00
parent 8d0124aba3
commit ce4051a803
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asterisk/app.h
View File

@@ -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); int ast_app_group_discard(struct ast_channel *chan);
/*! Update all group counting for a channel to a new one */ /*! 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 */ /*! Lock the group count list */
int ast_app_group_list_lock(void); int ast_app_group_list_lock(void);

2
include/asterisk/speech.h
View File

@@ -73,7 +73,7 @@ struct ast_speech_engine {
/*! Name of speech engine */ /*! Name of speech engine */
char *name; char *name;
/*! Set up the speech structure within the engine */ /*! 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 */ /*! Destroy any data set on the speech structure by the engine */
int (*destroy)(struct ast_speech *speech); int (*destroy)(struct ast_speech *speech);
/*! Load a local grammar on the speech structure */ /*! Load a local grammar on the speech structure */

4
res/res_speech.c
View File

@@ -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); 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 */ /* 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); ast_mutex_destroy(&new_speech->lock);
free(new_speech); free(new_speech);
new_speech = NULL; new_speech = NULL;
@@ -251,7 +251,7 @@ int ast_speech_register(struct ast_speech_engine *engine)
int res = 0; int res = 0;
/* Confirm the engine meets the minimum API requirements */ /* 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); ast_log(LOG_WARNING, "Speech recognition engine '%s' did not meet minimum API requirements.\n", engine->name);
return -1; return -1;
} }