[svn-commits] tzafrir: branch 1.4 r4368 - in /branches/1.4: ./ kernel/xpp/xdefs.h

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Sat Jun 28 02:48:57 2008
New Revision: 4368

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4368
Log:
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

Modified:
    branches/1.4/   (props changed)
    branches/1.4/kernel/xpp/xdefs.h

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/kernel/xpp/xdefs.h
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/xpp/xdefs.h?view=diff&rev=4368&r1=4367&r2=4368
==============================================================================
--- branches/1.4/kernel/xpp/xdefs.h (original)
+++ branches/1.4/kernel/xpp/xdefs.h Sat Jun 28 02:48:57 2008
@@ -114,7 +114,12 @@
 				} 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;