summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-06-28 07:24:46 +0000
committertzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2008-06-28 07:24:46 +0000
commit77af90cc9ad5306026f3f55bb5f00ba6e9b54a07 (patch)
tree7d027e86ce9582e8661e01ea59aadeb106e7e9d7
parent7383423691bf485c47a65f61f1f631c493bd0d29 (diff)
Fixes building with the kernel of RHEL 5.2. Closes issue #12889 .
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@4367 5390a7c7-147a-4af0-8ec9-7488f05a26cb
-rw-r--r--xpp/xdefs.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/xpp/xdefs.h b/xpp/xdefs.h
index f928fd4..9e6b783 100644
--- a/xpp/xdefs.h
+++ b/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