mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 20:20:07 +00:00
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/branches/1.4@66775 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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);
|
||||
|
@@ -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 */
|
||||
|
@@ -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;
|
||||
|
Reference in New Issue
Block a user