diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-09 17:08:29 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-09 17:08:29 +0000 |
| commit | 49b42ffa8d523b125f4fa40648c9fd77815c881c (patch) | |
| tree | b3e46ccf8b69e814f71dfef7c90dfc998e4ad0d3 /channels/chan_phone.c | |
| parent | 3a8d33312d9500b7af23b1b27f0075ee2e0c49eb (diff) | |
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.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47382 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_phone.c')
| -rw-r--r-- | channels/chan_phone.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_phone.c b/channels/chan_phone.c index 244326cd8..c8c151262 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 <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> #include "asterisk/lock.h" |