[svn-commits] mmichelson: branch 1.6.0 r125852 - in /branches/1.6.0: channels/ main/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Jun 27 09:57:28 2008
New Revision: 125852

URL: http://svn.digium.com/view/asterisk?view=rev&rev=125852
Log:
Make sure to only include dahdi/user.h if we have
installed DAHDI. 


Modified:
    branches/1.6.0/channels/chan_iax2.c
    branches/1.6.0/main/asterisk.c
    branches/1.6.0/main/channel.c

Modified: branches/1.6.0/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_iax2.c?view=diff&rev=125852&r1=125851&r2=125852
==============================================================================
--- branches/1.6.0/channels/chan_iax2.c (original)
+++ branches/1.6.0/channels/chan_iax2.c Fri Jun 27 09:57:28 2008
@@ -53,7 +53,9 @@
 #include <sys/stat.h>
 #include <regex.h>
 #include <sys/ioctl.h>
+#if defined(HAVE_DAHDI)
 #include <dahdi/user.h>
+#endif
 
 #include "asterisk/paths.h"	/* need ast_config_AST_DATA_DIR for firmware */
 

Modified: branches/1.6.0/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/asterisk.c?view=diff&rev=125852&r1=125851&r2=125852
==============================================================================
--- branches/1.6.0/main/asterisk.c (original)
+++ branches/1.6.0/main/asterisk.c Fri Jun 27 09:57:28 2008
@@ -87,7 +87,9 @@
 #endif
 
 #include <sys/ioctl.h>
+#if defined(HAVE_DAHDI)
 #include <dahdi/user.h>
+#endif
 
 #ifdef linux
 #include <sys/prctl.h>

Modified: branches/1.6.0/main/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/channel.c?view=diff&rev=125852&r1=125851&r2=125852
==============================================================================
--- branches/1.6.0/main/channel.c (original)
+++ branches/1.6.0/main/channel.c Fri Jun 27 09:57:28 2008
@@ -33,7 +33,9 @@
 #include <signal.h>
 #include <math.h>
 #include <sys/ioctl.h>
+#if defined(HAVE_DAHDI)
 #include <dahdi/user.h>
+#endif
 
 #include "asterisk/paths.h"	/* use ast_config_AST_SYSTEM_NAME */