Merged revisions 47380 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 9 Nov 2006 17:08:29 +0000 (17:08 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 9 Nov 2006 17:08:29 +0000 (17:08 +0000)
commitead6c4655e13f1c2131b4b9d8046fb63aadf6aa3
treeb3e46ccf8b69e814f71dfef7c90dfc998e4ad0d3
parent7209032ffeb382478e1c95c72a926ab9cc3d1641
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
channels/chan_phone.c