diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-09-21 14:40:10 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-09-21 14:40:10 +0000 |
| commit | 9f64905d4e2fe7372cc574338e50579455c11602 (patch) | |
| tree | 9799cdd844ef78877a6446a6746e82e0c090bc9a /include/asterisk/channel.h | |
| parent | 78a94595f6a5543d9155270f9b83145df22d9d24 (diff) | |
Merged revisions 83432 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83432 | russell | 2007-09-21 09:37:20 -0500 (Fri, 21 Sep 2007) | 4 lines
gcc 4.2 has a new set of warnings dealing with cosnt pointers. This set of
changes gets all of Asterisk (minus chan_alsa for now) to compile with gcc 4.2.
(closes issue #10774, patch from qwell)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83433 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/channel.h')
| -rw-r--r-- | include/asterisk/channel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 57b7552c6..95465dfd9 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -428,7 +428,7 @@ struct ast_channel { int oldwriteformat; /*!< Original writer format */ int timingfd; /*!< Timing fd */ - int (*timingfunc)(void *data); + int (*timingfunc)(const void *data); void *timingdata; enum ast_channel_state _state; /*!< State of line -- Don't write directly, use ast_setstate() */ @@ -1234,7 +1234,7 @@ int ast_autoservice_stop(struct ast_channel *chan); /* If built with zaptel optimizations, force a scheduled expiration on the timer fd, at which point we call the callback function / data */ -int ast_settimeout(struct ast_channel *c, int samples, int (*func)(void *data), void *data); +int ast_settimeout(struct ast_channel *c, int samples, int (*func)(const void *data), void *data); /*! \brief Transfer a channel (if supported). Returns -1 on error, 0 if not supported and 1 if supported and requested |