From fb06154326720e90c5cee4f3dd1d0ff57a34f5b3 Mon Sep 17 00:00:00 2001 From: martinp Date: Thu, 16 Oct 2003 21:11:29 +0000 Subject: Revert the previous patch since it's braking compilation git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1636 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_skinny.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'channels/chan_skinny.c') diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index ac3c4e784..4583814a7 100755 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -863,7 +863,6 @@ static void transmit_tone(struct skinnysession *s, int tone) transmit_response(s, req); } -#if 0 static void transmit_selectsoftkeys(struct skinnysession *s, int instance, int callid, int softkey) { skinny_req *req; @@ -882,7 +881,6 @@ static void transmit_selectsoftkeys(struct skinnysession *s, int instance, int c req->data.selectsoftkey.softKeySetIndex = softkey; transmit_response(s, req); } -#endif static void transmit_lamp_indication(struct skinnysession *s, int instance, int indication) { @@ -2320,7 +2318,7 @@ static void *accept_thread(void *ignore) for (;;) { sinlen = sizeof(sin); - as = accept(skinnysock, (struct sockaddr *)&sin, &sinlen); + as = accept(skinnysock, &sin, &sinlen); if (as < 0) { ast_log(LOG_NOTICE, "Accept returned -1: %s\n", strerror(errno)); continue; @@ -2395,7 +2393,7 @@ static int restart_monitor(void) { /* If we're supposed to be stopped -- stay stopped */ - if (monitor_thread == (pthread_t)-2) + if (monitor_thread == -2) return 0; if (ast_mutex_lock(&monlock)) { ast_log(LOG_WARNING, "Unable to lock monitor\n"); -- cgit v1.2.3