[asterisk-commits] qwell: trunk r43240 - in /trunk/utils: Makefile muted.c

[asterisk-commits at lists.digium.com]

Author: qwell
Date: Mon Sep 18 17:35:40 2006
New Revision: 43240

URL: http://svn.digium.com/view/asterisk?rev=43240&view=rev
Log:
Change the includes to work on FreeBSD
Linux has sys/soundcard.h, which does a #include <linux/soundcard.h>

Modified:
    trunk/utils/Makefile
    trunk/utils/muted.c

Modified: trunk/utils/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/utils/Makefile?rev=43240&r1=43239&r2=43240&view=diff
==============================================================================
--- trunk/utils/Makefile (original)
+++ trunk/utils/Makefile Mon Sep 18 17:35:40 2006
@@ -17,6 +17,7 @@
 
 ifeq (${OSARCH},SunOS)
   LIBS+=-lsocket -lnsl
+  UTILS:=$(filter-out muted,$(UTILS))
 endif
 
 ifeq ($(POPT_LIB),)

Modified: trunk/utils/muted.c
URL: http://svn.digium.com/view/asterisk/trunk/utils/muted.c?rev=43240&r1=43239&r2=43240&view=diff
==============================================================================
--- trunk/utils/muted.c (original)
+++ trunk/utils/muted.c Mon Sep 18 17:35:40 2006
@@ -35,10 +35,10 @@
  *
  */
 
-#ifndef __Darwin__
-#include <linux/soundcard.h>
-#else
+#ifdef __Darwin__
 #include <CoreAudio/AudioHardware.h> 
+#elif defined(__linux__) || defined(__FreeBSD__)
+#include <sys/soundcard.h>
 #endif
 #include <stdio.h>
 #include <errno.h>