[svn-commits] sruffell: linux/trunk r8134 - in /linux/trunk: drivers/dahdi/xpp/ include/dahdi/

[SVN commits to the Digium repositories]

Author: sruffell
Date: Fri Feb 26 11:57:09 2010
New Revision: 8134

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8134
Log:
Revert "dahdi: Move the definition of bool from xdefs.h into include/dahdi/kernel.h"

Reverts r8117.  The wctdm24xxp driver can include <stdbool.h> directly.

Reported by: seanbright

Modified:
    linux/trunk/drivers/dahdi/xpp/xdefs.h
    linux/trunk/drivers/dahdi/xpp/xframe_queue.h
    linux/trunk/include/dahdi/kernel.h

Modified: linux/trunk/drivers/dahdi/xpp/xdefs.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/xpp/xdefs.h?view=diff&rev=8134&r1=8133&r2=8134
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xdefs.h (original)
+++ linux/trunk/drivers/dahdi/xpp/xdefs.h Fri Feb 26 11:57:09 2010
@@ -144,6 +144,14 @@
 #define	SET_PROC_DIRENTRY_OWNER(p)	do { } while(0);
 #endif
 
+#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

Modified: linux/trunk/drivers/dahdi/xpp/xframe_queue.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/xpp/xframe_queue.h?view=diff&rev=8134&r1=8133&r2=8134
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xframe_queue.h (original)
+++ linux/trunk/drivers/dahdi/xpp/xframe_queue.h Fri Feb 26 11:57:09 2010
@@ -3,7 +3,6 @@
 
 #include <linux/list.h>
 #include <linux/spinlock.h>
-#include <dahdi/kernel.h>
 #include "xdefs.h"
 
 #define	XFRAME_QUEUE_MARGIN	10

Modified: linux/trunk/include/dahdi/kernel.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/include/dahdi/kernel.h?view=diff&rev=8134&r1=8133&r2=8134
==============================================================================
--- linux/trunk/include/dahdi/kernel.h (original)
+++ linux/trunk/include/dahdi/kernel.h Fri Feb 26 11:57:09 2010
@@ -1209,15 +1209,6 @@
 #endif /* 2.6.25 */
 #endif /* 2.6.31 */
 
-#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
-
 #ifndef DMA_BIT_MASK
 #define DMA_BIT_MASK(n)	(((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
 #endif