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/file.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/file.c')
-rw-r--r-- | main/file.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/main/file.c b/main/file.c index d64e9cd94..19f50bf81 100644 --- a/main/file.c +++ b/main/file.c @@ -609,7 +609,7 @@ enum fsread_res { FSREAD_SUCCESS_NOSCHED, }; -static int ast_fsread_audio(void *data); +static int ast_fsread_audio(const void *data); static enum fsread_res ast_readaudio_callback(struct ast_filestream *s) { @@ -648,9 +648,9 @@ return_failure: return FSREAD_FAILURE; } -static int ast_fsread_audio(void *data) +static int ast_fsread_audio(const void *data) { - struct ast_filestream *fs = data; + struct ast_filestream *fs = (struct ast_filestream *)data; enum fsread_res res; res = ast_readaudio_callback(fs); @@ -661,7 +661,7 @@ static int ast_fsread_audio(void *data) return 0; } -static int ast_fsread_video(void *data); +static int ast_fsread_video(const void *data); static enum fsread_res ast_readvideo_callback(struct ast_filestream *s) { @@ -687,9 +687,9 @@ static enum fsread_res ast_readvideo_callback(struct ast_filestream *s) return FSREAD_SUCCESS_SCHED; } -static int ast_fsread_video(void *data) +static int ast_fsread_video(const void *data) { - struct ast_filestream *fs = data; + struct ast_filestream *fs = (struct ast_filestream *)data; enum fsread_res res; res = ast_readvideo_callback(fs); |