From 6e693fdb0c3cd940332f83d83c5bacba0014bcc3 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Thu, 9 Nov 2006 16:53:25 +0000 Subject: [PATCH] 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. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@47380 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_phone.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/channels/chan_phone.c b/channels/chan_phone.c index 73c97386cd..dd02c0e23b 100644 --- a/channels/chan_phone.c +++ b/channels/chan_phone.c @@ -49,8 +49,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") /* Still use some IXJ specific stuff */ #include #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) # include #endif +#endif #include #include "asterisk/lock.h"