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 /include/asterisk/app.h | |
| 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
Diffstat (limited to 'include/asterisk/app.h')
| -rw-r--r-- | include/asterisk/app.h | 2 |
1 files changed, 1 insertions, 1 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); |