mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
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: https://origsvn.digium.com/svn/asterisk/trunk@83433 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
12
main/file.c
12
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);
|
||||
|
Reference in New Issue
Block a user