[Asterisk-cvs] asterisk/apps Makefile,1.63,1.64 app_intercom.c,1.16,1.17

[markster at lists.digium.com]

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

Modified Files:
	Makefile app_intercom.c 
Log Message:
Merge OSS fixes for FreeBSD, implement rtptimeout and rtpholdtimeout


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/Makefile,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- Makefile	26 May 2004 18:38:10 -0000	1.63
+++ Makefile	27 May 2004 22:12:55 -0000	1.64
@@ -30,10 +30,8 @@
      app_groupcount.so app_txtcidname.so app_controlplayback.so
 
 ifneq (${OSARCH},Darwin)
-ifneq (${OSARCH},FreeBSD)
 APPS+=app_intercom.so
 endif
-endif
 
 #APPS+=app_sql_postgres.so
 #APPS+=app_sql_odbc.so

Index: app_intercom.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_intercom.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- app_intercom.c	6 Apr 2004 22:17:31 -0000	1.16
+++ app_intercom.c	27 May 2004 22:12:55 -0000	1.17
@@ -29,7 +29,7 @@
 #ifdef __linux__
 #include <linux/soundcard.h>
 #elif defined(__FreeBSD__)
-#include <machine/soundcard.h>
+#include <sys/soundcard.h>
 #else
 #include <soundcard.h>
 #endif