summaryrefslogtreecommitdiff
path: root/drivers/dahdi/xpp/xdefs.h
diff options
context:
space:
mode:
authorTzafrir Cohen <tzafrir.cohen@xorcom.com>2008-06-28 08:11:59 +0000
committerTzafrir Cohen <tzafrir.cohen@xorcom.com>2008-06-28 08:11:59 +0000
commit6c842ef4520b9d87c68d5a9bae52051232fb4186 (patch)
tree815ff17b9db65857dc0641b5ad3951ae6304a1f3 /drivers/dahdi/xpp/xdefs.h
parentbc922245d191ce645af61d6e145eb939b56aefd3 (diff)
Fixes building with kernel of RHEl 5.2. Closes issue #12889 .
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4467 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/xpp/xdefs.h')
-rw-r--r--drivers/dahdi/xpp/xdefs.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/dahdi/xpp/xdefs.h b/drivers/dahdi/xpp/xdefs.h
index e6e69f1..41d9e5d 100644
--- a/drivers/dahdi/xpp/xdefs.h
+++ b/drivers/dahdi/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