[svn-commits] tilghman: branch 1.4 r166592 - in /branches/1.4: channels/ main/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Dec 23 09:35:38 2008
New Revision: 166592

URL: http://svn.digium.com/view/asterisk?view=rev&rev=166592
Log:
Compile, even if both DAHDI and Zaptel are not installed.
(Closes issue #14120)

Modified:
    branches/1.4/channels/chan_iax2.c
    branches/1.4/main/asterisk.c

Modified: branches/1.4/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_iax2.c?view=diff&rev=166592&r1=166591&r2=166592
==============================================================================
--- branches/1.4/channels/chan_iax2.c (original)
+++ branches/1.4/channels/chan_iax2.c Tue Dec 23 09:35:38 2008
@@ -11231,6 +11231,7 @@
 	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 @@
 		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));
 

Modified: branches/1.4/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/asterisk.c?view=diff&rev=166592&r1=166591&r2=166592
==============================================================================
--- branches/1.4/main/asterisk.c (original)
+++ branches/1.4/main/asterisk.c Tue Dec 23 09:35:38 2008
@@ -3034,6 +3034,7 @@
 	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 @@
 			close(fd);
 		}
 	}
+#endif
 	threadstorage_init();
 
 	astobj2_init();