aboutsummaryrefslogtreecommitdiffstats
path: root/main/rtp.c
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-09-21 14:37:20 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-09-21 14:37:20 +0000
commit02c2b2e2c1f00151ac2099ff68efda2ac89271a0 (patch)
treeb76c4146efd5357b7e89db353ccebf4bdefa8e7b /main/rtp.c
parentec43deabe7d576aca83ebbda30dfc0290e38ef3c (diff)
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/branches/1.4@83432 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/rtp.c')
-rw-r--r--main/rtp.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/main/rtp.c b/main/rtp.c
index f4b058570..39f8c85ec 100644
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -175,10 +175,10 @@ struct ast_rtp {
};
/* Forward declarations */
-static int ast_rtcp_write(void *data);
+static int ast_rtcp_write(const void *data);
static void timeval2ntp(struct timeval tv, unsigned int *msw, unsigned int *lsw);
-static int ast_rtcp_write_sr(void *data);
-static int ast_rtcp_write_rr(void *data);
+static int ast_rtcp_write_sr(const void *data);
+static int ast_rtcp_write_rr(const void *data);
static unsigned int ast_rtcp_calc_interval(struct ast_rtp *rtp);
static int ast_rtp_senddigit_continuation(struct ast_rtp *rtp);
int ast_rtp_senddigit_end(struct ast_rtp *rtp, char digit);
@@ -2307,9 +2307,9 @@ int ast_rtcp_send_h261fur(void *data)
}
/*! \brief Send RTCP sender's report */
-static int ast_rtcp_write_sr(void *data)
+static int ast_rtcp_write_sr(const void *data)
{
- struct ast_rtp *rtp = data;
+ struct ast_rtp *rtp = (struct ast_rtp *)data;
int res;
int len = 0;
struct timeval now;
@@ -2421,9 +2421,9 @@ static int ast_rtcp_write_sr(void *data)
}
/*! \brief Send RTCP recepient's report */
-static int ast_rtcp_write_rr(void *data)
+static int ast_rtcp_write_rr(const void *data)
{
- struct ast_rtp *rtp = data;
+ struct ast_rtp *rtp = (struct ast_rtp *)data;
int res;
int len = 32;
unsigned int lost;
@@ -2520,9 +2520,9 @@ static int ast_rtcp_write_rr(void *data)
/*! \brief Write and RTCP packet to the far end
* \note Decide if we are going to send an SR (with Reception Block) or RR
* RR is sent if we have not sent any rtp packets in the previous interval */
-static int ast_rtcp_write(void *data)
+static int ast_rtcp_write(const void *data)
{
- struct ast_rtp *rtp = data;
+ struct ast_rtp *rtp = (struct ast_rtp *)data;
int res;
if (!rtp || !rtp->rtcp)