[zaptel-commits] qwell: trunk r2822 - in /trunk: ./ zaptel.h

[SVN commits to the Zaptel project]

Author: qwell
Date: Mon Aug  6 15:23:16 2007
New Revision: 2822

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2822
Log:
Merged revisions 2821 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

(closes issue #10254)
........
r2821 | qwell | 2007-08-06 15:20:02 -0500 (Mon, 06 Aug 2007) | 4 lines

Include some headers from the target system rather than the build system.

Issue 10254, patch by mirabilos

........

Modified:
    trunk/   (props changed)
    trunk/zaptel.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/zaptel.h
URL: http://svn.digium.com/view/zaptel/trunk/zaptel.h?view=diff&rev=2822&r1=2821&r2=2822
==============================================================================
--- trunk/zaptel.h (original)
+++ trunk/zaptel.h Mon Aug  6 15:23:16 2007
@@ -72,8 +72,6 @@
 #include "ecdis.h"
 #include "fasthdlc.h"
 
-#endif /* __KERNEL__ */
-
 #ifdef CONFIG_DEVFS_FS
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
 #include <linux/devfs_fs_kernel.h>
@@ -82,6 +80,7 @@
 //#warning "Zaptel doesn't support DEVFS in post 2.4 kernels.  Disabling DEVFS in zaptel"
 #endif
 #endif /* CONFIG_DEVFS_FS */
+#endif /* __KERNEL__ */
 
 #ifndef ELAST
 #define ELAST 500