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: https://origsvn.digium.com/svn/asterisk/trunk@47382 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp 2006-11-09 17:08:29 +00:00
parent 7209032ffe
commit ead6c4655e
1 changed files with 2 additions and 0 deletions

View File

@ -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"