[asterisk-commits] file: trunk r47382 - in /trunk: ./ channels/chan_phone.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Thu Nov  9 11:08:29 2006
New Revision: 47382

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47382
Log:
Merged revisions 47380 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r47380 | file | 2006-11-09 11:53:25 -0500 (Thu, 09 Nov 2006) | 10 lines

Merged revisions 47379 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r47379 | file | 2006-11-09 11:48:05 -0500 (Thu, 09 Nov 2006) | 2 lines

Don't include compiler.h on kernels 2.6.18 and higher as, well, it's apparently going to be removed. This should make all you FC6 fans happy as your Asterisk will now build without any mods.

........

................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_phone.c

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

Modified: trunk/channels/chan_phone.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_phone.c?view=diff&rev=47382&r1=47381&r2=47382
==============================================================================
--- trunk/channels/chan_phone.c (original)
+++ trunk/channels/chan_phone.c Thu Nov  9 11:08:29 2006
@@ -49,7 +49,9 @@
 /* Still use some IXJ specific stuff */
 #include <linux/version.h>
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
 # include <linux/compiler.h>
+#endif
 #endif
 #include <linux/ixjuser.h>