diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-23 15:35:38 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-23 15:35:38 +0000 |
| commit | a16fe9bcce9590ae10e87af301abd6486696db1f (patch) | |
| tree | b512e40d5839b04cf8a5f04e27a6e26559d8ac59 | |
| parent | 27ab40ff39c113afe44823ac3ba1b0423cfc255a (diff) | |
Compile, even if both DAHDI and Zaptel are not installed.
(Closes issue #14120)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@166592 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_iax2.c | 2 | ||||
| -rw-r--r-- | main/asterisk.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index aefc0b26e..b50c968fd 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -11231,6 +11231,7 @@ static int load_module(void) iax_set_error(iax_error_output); jb_setoutput(jb_error_output, jb_warning_output, NULL); +#ifdef HAVE_DAHDI #ifdef DAHDI_TIMERACK timingfd = open(DAHDI_FILE_TIMER, O_RDWR); if (timingfd < 0) @@ -11238,6 +11239,7 @@ static int load_module(void) timingfd = open(DAHDI_FILE_PSEUDO, O_RDWR); if (timingfd < 0) ast_log(LOG_WARNING, "Unable to open IAX timing interface: %s\n", strerror(errno)); +#endif memset(iaxs, 0, sizeof(iaxs)); diff --git a/main/asterisk.c b/main/asterisk.c index 2afe01a81..8ef99c683 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -3034,6 +3034,7 @@ int main(int argc, char *argv[]) dahdi_chan_name_len = &_dahdi_chan_name_len; dahdi_chan_mode = &_dahdi_chan_mode; +#ifdef HAVE_DAHDI { int fd; int x = 160; @@ -3070,6 +3071,7 @@ int main(int argc, char *argv[]) close(fd); } } +#endif threadstorage_init(); astobj2_init(); |