diff options
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/Makefile | 5 | ||||
| -rw-r--r-- | channels/chan_oss.c | 1 | ||||
| -rw-r--r-- | channels/chan_unistim.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/channels/Makefile b/channels/Makefile index 3af4da971..c02bbebf9 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -37,11 +37,6 @@ ifeq ($(OSARCH),NetBSD) H323LIB=-lh323_NetBSD_x86_r endif -MODULE_EXCLUDE:= -ifneq ($(findstring $(OSARCH), mingw32 cygwin ),) - MODULE_EXCLUDE+= chan_oss chan_unistim -endif - ifeq ($(wildcard h323/libchanh323.a),) MODULE_EXCLUDE += chan_h323 endif diff --git a/channels/chan_oss.c b/channels/chan_oss.c index ad0410d32..10a333464 100644 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -35,6 +35,7 @@ /*** MODULEINFO <depend>ossaudio</depend> + <conflict>winarch</conflict> ***/ #include "asterisk.h" diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index 53dff56ef..8df1ef419 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -32,6 +32,10 @@ * \ingroup channel_drivers */ +/*** MODULEINFO + <conflict>winarch</conflict> + ***/ + #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") |