diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-09-08 16:48:07 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-09-08 16:48:07 +0000 |
| commit | 2be6d9d7c174007ac0018fed802364d2115f0283 (patch) | |
| tree | 32674bc8c5dc21153e7c8a4548f6641aef0566bf /include | |
| parent | ee8cba2208114438d40442616149adf12cc422c2 (diff) | |
BSD portability enhancements (bug #234)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1486 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rwxr-xr-x | include/asterisk/channel.h | 3 | ||||
| -rwxr-xr-x | include/asterisk/srv.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index cb56d8a7a..815f882f4 100755 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -17,6 +17,7 @@ #include <asterisk/frame.h> #include <asterisk/sched.h> #include <asterisk/chanvars.h> +#include <unistd.h> #include <setjmp.h> #include <pthread.h> @@ -771,7 +772,7 @@ static inline int ast_select(int nfds, fd_set *rfds, fd_set *wfds, fd_set *efds, #define CHECK_BLOCKING(c) { \ if ((c)->blocking) {\ - ast_log(LOG_WARNING, "Thread %ld Blocking '%s', already blocked by thread %ld in procedure %s\n", pthread_self(), (c)->name, (c)->blocker, (c)->blockproc); \ + ast_log(LOG_WARNING, "Thread %ld Blocking '%s', already blocked by thread %ld in procedure %s\n", (long) pthread_self(), (c)->name, (long) (c)->blocker, (c)->blockproc); \ CRASH; \ } else { \ (c)->blocker = pthread_self(); \ diff --git a/include/asterisk/srv.h b/include/asterisk/srv.h index df8a411c5..1c3711dae 100755 --- a/include/asterisk/srv.h +++ b/include/asterisk/srv.h @@ -13,7 +13,9 @@ #ifndef _ASTERISK_SRV_H #define _ASTERISK_SRV_H -#include <asterisk/channel.h> + +struct ast_channel; + /* Lookup entry in SRV records Returns 1 if found, 0 if not found, -1 on hangup */ extern int ast_get_srv(struct ast_channel *chan, char *host, int hostlen, int *port, const char *service); |