From 16927b7f7a7bce25329d1c2be0f31fbd789cb221 Mon Sep 17 00:00:00 2001 From: russell Date: Fri, 21 Sep 2007 14:40:10 +0000 Subject: 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: http://svn.digium.com/svn/asterisk/trunk@83433 f38db490-d61c-443f-a65b-d21fe96a405b --- include/asterisk/channel.h | 4 ++-- include/asterisk/sched.h | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'include') 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 diff --git a/include/asterisk/sched.h b/include/asterisk/sched.h index 5238ecab5..f074518c5 100644 --- a/include/asterisk/sched.h +++ b/include/asterisk/sched.h @@ -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); /*! * \brief replace a scheduler entry @@ -81,7 +81,7 @@ int ast_sched_add(struct sched_context *con, int when, ast_sched_cb callback, vo * \retval -1 failure * \retval otherwise, returns scheduled item ID */ -int ast_sched_replace(int old_id, struct sched_context *con, int when, ast_sched_cb callback, void *data); +int ast_sched_replace(int old_id, 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 @@ -96,7 +96,7 @@ int ast_sched_replace(int old_id, struct sched_context *con, int when, ast_sched * 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 replace a scheduler entry @@ -108,7 +108,7 @@ int ast_sched_add_variable(struct sched_context *con, int when, ast_sched_cb cal * \retval -1 failure * \retval otherwise, returns scheduled item ID */ -int ast_sched_replace_variable(int old_id, struct sched_context *con, int when, ast_sched_cb callback, void *data, int variable); +int ast_sched_replace_variable(int old_id, 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 -- cgit v1.2.3