diff options
| author | Martin Pycko <martinp@digium.com> | 2003-10-16 21:11:29 +0000 |
|---|---|---|
| committer | Martin Pycko <martinp@digium.com> | 2003-10-16 21:11:29 +0000 |
| commit | 13b7b73b08696e3742dc792a17b97a07ad51ac8f (patch) | |
| tree | cc2f2933e7a795828dc45967623934d3a58b9973 /channels/chan_skinny.c | |
| parent | d5b54e4b7f808e545eb37c1dcd5d2eb0613c4bae (diff) | |
Revert the previous patch since it's braking compilation
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1636 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_skinny.c')
| -rwxr-xr-x | channels/chan_skinny.c | 6 |
1 files changed, 2 insertions, 4 deletions
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"); |