diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-24 17:11:45 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-24 17:11:45 +0000 |
| commit | 29f496ef12247a2401d02428fa533020b588f5b6 (patch) | |
| tree | 170532911902642fdae405ec644509398b0b6ee5 /res/res_musiconhold.c | |
| parent | 3cbcc049473cb374710364337d0d415c56133b0e (diff) | |
Thanks to the fine work of Russell Bryant and Dancho Lazarov, we now have autoconf and menuselect tools for Asterisk!
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@22267 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_musiconhold.c')
| -rw-r--r-- | res/res_musiconhold.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 30a363574..061934335 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -1,7 +1,7 @@ /* * Asterisk -- An open source telephony toolkit. * - * Copyright (C) 1999 - 2005, Digium, Inc. + * Copyright (C) 1999 - 2006, Digium, Inc. * * Mark Spencer <markster@digium.com> * @@ -25,6 +25,10 @@ * \author Mark Spencer <markster@digium.com> */ +/*** MODULEINFO + <conflict>win32</conflict> + ***/ + #include <stdlib.h> #include <errno.h> #include <unistd.h> @@ -37,13 +41,6 @@ #include <netinet/in.h> #include <sys/stat.h> #include <dirent.h> -#ifdef ZAPATA_MOH -#ifdef __linux__ -#include <linux/zaptel.h> -#else -#include <zaptel.h> -#endif /* __linux__ */ -#endif #include <unistd.h> #include <sys/ioctl.h> @@ -51,6 +48,14 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") +#ifdef HAVE_ZAPTEL +#ifdef __linux__ +#include <linux/zaptel.h> +#else +#include <zaptel.h> +#endif /* __linux__ */ +#endif + #include "asterisk/lock.h" #include "asterisk/file.h" #include "asterisk/logger.h" @@ -796,7 +801,7 @@ static int moh_scan_files(struct mohclass *class) { static int moh_register(struct mohclass *moh, int reload) { -#ifdef ZAPATA_MOH +#ifdef HAVE_ZAPTEL int x; #endif ast_mutex_lock(&moh_lock); @@ -834,7 +839,7 @@ static int moh_register(struct mohclass *moh, int reload) ast_set_flag(moh, MOH_QUIET); moh->srcfd = -1; -#ifdef ZAPATA_MOH +#ifdef HAVE_ZAPTEL /* Open /dev/zap/pseudo for timing... Is there a better, yet reliable way to do this? */ moh->pseudofd = open("/dev/zap/pseudo", O_RDONLY); @@ -1228,3 +1233,4 @@ static const char *key(void) } STD_MOD(MOD_0 | NO_USECOUNT | NO_UNLOAD, reload, NULL, NULL); + |