From: Luigi Rizzo <rizzo@icir.org>
Date: Mon, 17 Dec 2007 22:38:48 +0000 (+0000)
Subject: surprising as it may be, chan_oss compiles correctly under cygwin as well,
X-Git-Tag: 1.6.0-beta1~3^2~386
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a3c4095ba1b897ea2ecbea4ec66d9123a57e49b;p=thirdparty%2Fasterisk.git

surprising as it may be, chan_oss compiles correctly under cygwin as well,
provided you look for soundcard.h in the right place...



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@93380 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 10a333464b..94c114f967 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -35,7 +35,6 @@
 
 /*** MODULEINFO
 	<depend>ossaudio</depend>
-	<conflict>winarch</conflict>
  ***/
 
 #include "asterisk.h"
@@ -48,7 +47,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #ifdef __linux
 #include <linux/soundcard.h>
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__CYGWIN__)
 #include <sys/soundcard.h>
 #else
 #include <soundcard.h>