From 1282b2db1e85a0a6b12dcfe087bb614c19a71073 Mon Sep 17 00:00:00 2001 From: tzafrir Date: Sat, 28 Jun 2008 07:48:57 +0000 Subject: Fixes building with the kernel of RHEL 5.2. Closes issue #12889 . Merged revisions 4367 via svnmerge from http://svn.digium.com/svn/zaptel/branches/1.2 git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4368 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- kernel/xpp/xdefs.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'kernel/xpp') diff --git a/kernel/xpp/xdefs.h b/kernel/xpp/xdefs.h index f928fd4..9e6b783 100644 --- a/kernel/xpp/xdefs.h +++ b/kernel/xpp/xdefs.h @@ -114,8 +114,13 @@ typedef unsigned char byte; } while(0); #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) +/* Also don't define this for later RHEL >= 5.2 . hex_asc is from the + * same linux-2.6-net-infrastructure-updates-to-mac80211-iwl4965.patch + * as is the bool typedef. */ +#if LINUX_VERSION_CODE != KERNEL_VERSION(2,6,18) || ! defined(hex_asc) typedef int bool; #endif +#endif #else typedef int bool; #endif -- cgit v1.2.3