From 19a2be29f3071daaefc6314db00a47e62d276b70 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Thu, 31 May 2007 18:41:58 +0000 Subject: [PATCH] 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 --- include/asterisk/app.h | 2 +- include/asterisk/speech.h | 2 +- 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 1c6dca0e7a..fc0536e066 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 09d08ddb12..3af01e614d 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 419c6086e4..16673538bc 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;