summaryrefslogtreecommitdiff
path: root/channels/chan_misdn.c
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2007-09-21 14:40:10 +0000
committerRussell Bryant <russell@russellbryant.com>2007-09-21 14:40:10 +0000
commit9f64905d4e2fe7372cc574338e50579455c11602 (patch)
tree9799cdd844ef78877a6446a6746e82e0c090bc9a /channels/chan_misdn.c
parent78a94595f6a5543d9155270f9b83145df22d9d24 (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: https://origsvn.digium.com/svn/asterisk/trunk@83433 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_misdn.c')
-rw-r--r--channels/chan_misdn.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 837a74997..d95441a0d 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -621,7 +621,7 @@ static inline void misdn_tasks_wakeup (void)
pthread_kill(misdn_tasks_thread, SIGUSR1);
}
-static inline int _misdn_tasks_add_variable (int timeout, ast_sched_cb callback, void *data, int variable)
+static inline int _misdn_tasks_add_variable (int timeout, ast_sched_cb callback, const void *data, int variable)
{
int task_id;
@@ -634,12 +634,12 @@ static inline int _misdn_tasks_add_variable (int timeout, ast_sched_cb callback,
return task_id;
}
-static int misdn_tasks_add (int timeout, ast_sched_cb callback, void *data)
+static int misdn_tasks_add (int timeout, ast_sched_cb callback, const void *data)
{
return _misdn_tasks_add_variable(timeout, callback, data, 0);
}
-static int misdn_tasks_add_variable (int timeout, ast_sched_cb callback, void *data)
+static int misdn_tasks_add_variable (int timeout, ast_sched_cb callback, const void *data)
{
return _misdn_tasks_add_variable(timeout, callback, data, 1);
}
@@ -649,14 +649,14 @@ static void misdn_tasks_remove (int task_id)
ast_sched_del(misdn_tasks, task_id);
}
-static int misdn_l1_task (void *data)
+static int misdn_l1_task (const void *data)
{
misdn_lib_isdn_l1watcher(*(int *)data);
chan_misdn_log(5, *(int *)data, "L1watcher timeout\n");
return 1;
}
-static int misdn_overlap_dial_task (void *data)
+static int misdn_overlap_dial_task (const void *data)
{
struct timeval tv_end, tv_now;
int diff;