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: https://origsvn.digium.com/svn/asterisk/trunk@66776 65c4cc65-6c06-0410-ace0-fbb531ad65f3

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);

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 */

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;
 	}