From e021f5fbb982c38c14e702fe76f9394a44a568e2 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Tue, 28 Nov 2006 16:59:20 +0000 Subject: Merged revisions 48088 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r48088 | file | 2006-11-28 11:57:16 -0500 (Tue, 28 Nov 2006) | 10 lines Merged revisions 48087 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r48087 | file | 2006-11-28 11:56:01 -0500 (Tue, 28 Nov 2006) | 2 lines According to the research I have done we never needed to include compiler.h in the first place so let's not! (issue #8430 reported by edguy3) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48089 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_phone.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/channels/chan_phone.c b/channels/chan_phone.c index c8c151262..cebbcd255 100644 --- a/channels/chan_phone.c +++ b/channels/chan_phone.c @@ -48,11 +48,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include /* 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" -- cgit v1.2.3