diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-21 14:40:10 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-21 14:40:10 +0000 |
| commit | 16927b7f7a7bce25329d1c2be0f31fbd789cb221 (patch) | |
| tree | 9799cdd844ef78877a6446a6746e82e0c090bc9a /main/rtp.c | |
| parent | e935ee6eac3ecb38b704ea2e9c2e86309150ab84 (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: http://svn.digium.com/svn/asterisk/trunk@83433 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/rtp.c')
| -rw-r--r-- | main/rtp.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/main/rtp.c b/main/rtp.c index 8f7587813..17d9d4bd1 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -181,10 +181,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); @@ -2654,9 +2654,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; @@ -2791,9 +2791,9 @@ static int ast_rtcp_write_sr(void *data) } /*! \brief Send RTCP recipient'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; @@ -2890,9 +2890,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) |