kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

gcc 4.2 has a new set of warnings dealing with cosnt pointers. This set of

Browse Source 
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/branches/1.4@83432 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-09-21 14:37:20 +00:00
parent 9ffb2fe0cf
commit d6b8fb4dc0
22 changed files with 142 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/asterisk/channel.h
View File

@@ -367,7 +367,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 */
@@ -1135,7 +1135,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

6
include/asterisk/sched.h
View File

@@ -55,7 +55,7 @@ void sched_context_destroy(struct sched_context *c);
* \return returns a 0 if it should not be run again, or non-zero if it should be
* rescheduled to run again
*/
typedef int (*ast_sched_cb)(void *data);
typedef int (*ast_sched_cb)(const void *data);
#define AST_SCHED_CB(a) ((ast_sched_cb)(a))
/*! \brief Adds a scheduled event
@@ -69,7 +69,7 @@ typedef int (*ast_sched_cb)(void *data);
* \param data data to pass to the callback
* \return Returns a schedule item ID on success, -1 on failure
*/
int ast_sched_add(struct sched_context *con, int when, ast_sched_cb callback, void *data);
int ast_sched_add(struct sched_context *con, int when, ast_sched_cb callback, const void *data);
/*!Adds a scheduled event with rescheduling support
* \param con Scheduler context to add
@@ -84,7 +84,7 @@ int ast_sched_add(struct sched_context *con, int when, ast_sched_cb callback, vo
* If callback returns 0, no further events will be re-scheduled
* \return Returns a schedule item ID on success, -1 on failure
*/
int ast_sched_add_variable(struct sched_context *con, int when, ast_sched_cb callback, void *data, int variable);
int ast_sched_add_variable(struct sched_context *con, int when, ast_sched_cb callback, const void *data, int variable);
/*! \brief Deletes a scheduled event
* Remove this event from being run. A procedure should not remove its