diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-05-27 22:12:55 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-05-27 22:12:55 +0000 |
commit | eadbf9f9ca677d4e199de180018f5bf149338738 (patch) | |
tree | ff3e36b608b7a399e59482f7cc4ab5f5d1ee65d1 /apps | |
parent | 12ce45cba733f2100d8a3d476f6ed900c5be74c1 (diff) |
Merge OSS fixes for FreeBSD, implement rtptimeout and rtpholdtimeout
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3097 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rwxr-xr-x | apps/Makefile | 2 | ||||
-rwxr-xr-x | apps/app_intercom.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/apps/Makefile b/apps/Makefile index 708ac94cc..e10209ec7 100755 --- a/apps/Makefile +++ b/apps/Makefile @@ -30,10 +30,8 @@ APPS=app_dial.so app_playback.so app_voicemail.so app_directory.so app_mp3.so\ 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 diff --git a/apps/app_intercom.c b/apps/app_intercom.c index 925ea37c2..1652aaa0b 100755 --- a/apps/app_intercom.c +++ b/apps/app_intercom.c @@ -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 |