aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_skinny.c
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2003-10-21 02:57:29 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2003-10-21 02:57:29 +0000
commit0f1c8b8df4a4bd8596282a341a5564195ecd340a (patch)
tree39859596c62f878a9f2957c3a40d36e48c475044 /channels/chan_skinny.c
parentbc32cd5adfe0da2d1d1a08c6bc5b04b9e7d0160e (diff)
FreeBSD patch, take 2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1638 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_skinny.c')
-rwxr-xr-xchannels/chan_skinny.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 4583814a7..ac3c4e784 100755
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -863,6 +863,7 @@ 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;
@@ -881,6 +882,7 @@ 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)
{
@@ -2318,7 +2320,7 @@ static void *accept_thread(void *ignore)
for (;;) {
sinlen = sizeof(sin);
- as = accept(skinnysock, &sin, &sinlen);
+ as = accept(skinnysock, (struct sockaddr *)&sin, &sinlen);
if (as < 0) {
ast_log(LOG_NOTICE, "Accept returned -1: %s\n", strerror(errno));
continue;
@@ -2393,7 +2395,7 @@ static int restart_monitor(void)
{
/* If we're supposed to be stopped -- stay stopped */
- if (monitor_thread == -2)
+ if (monitor_thread == (pthread_t)-2)
return 0;
if (ast_mutex_lock(&monlock)) {
ast_log(LOG_WARNING, "Unable to lock monitor\n");