[Asterisk-cvs] asterisk/include/asterisk channel.h,1.19,1.20 srv.h,1.1,1.2

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/include/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv30979/include/asterisk

Modified Files:
	channel.h srv.h 
Log Message:
BSD portability enhancements (bug #234)


Index: channel.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** channel.h	5 Sep 2003 04:00:57 -0000	1.19
--- channel.h	8 Sep 2003 16:48:07 -0000	1.20
***************
*** 18,21 ****
--- 18,22 ----
  #include <asterisk/sched.h>
  #include <asterisk/chanvars.h>
+ #include <unistd.h>
  #include <setjmp.h>
  #include <pthread.h>
***************
*** 772,776 ****
  #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); \
  								CRASH; \
  							} else { \
--- 773,777 ----
  #define CHECK_BLOCKING(c) { 	 \
  							if ((c)->blocking) {\
! 								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 { \

Index: srv.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/srv.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** srv.h	12 Jun 2003 22:14:03 -0000	1.1
--- srv.h	8 Sep 2003 16:48:07 -0000	1.2
***************
*** 14,18 ****
  #ifndef _ASTERISK_SRV_H
  #define _ASTERISK_SRV_H
! #include <asterisk/channel.h>
  /* 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);
--- 14,20 ----
  #ifndef _ASTERISK_SRV_H
  #define _ASTERISK_SRV_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);