diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2010-02-26 17:57:09 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2010-02-26 17:57:09 +0000 |
| commit | 6c4b332c2fcc60d2ee20005fc04973230e7d2b21 (patch) | |
| tree | 10496c73165694624710a1885403b20ec4e271cd | |
| parent | 663440c94dd1565961b7d0a2a48d1b98f23f8119 (diff) | |
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
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@8134 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/xpp/xdefs.h | 8 | ||||
| -rw-r--r-- | drivers/dahdi/xpp/xframe_queue.h | 1 | ||||
| -rw-r--r-- | include/dahdi/kernel.h | 9 |
3 files changed, 8 insertions, 10 deletions
diff --git a/drivers/dahdi/xpp/xdefs.h b/drivers/dahdi/xpp/xdefs.h index 482a8ee..24b2291 100644 --- a/drivers/dahdi/xpp/xdefs.h +++ b/drivers/dahdi/xpp/xdefs.h @@ -144,6 +144,14 @@ typedef unsigned char byte; #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 diff --git a/drivers/dahdi/xpp/xframe_queue.h b/drivers/dahdi/xpp/xframe_queue.h index 2c345b4..eba94dd 100644 --- a/drivers/dahdi/xpp/xframe_queue.h +++ b/drivers/dahdi/xpp/xframe_queue.h @@ -3,7 +3,6 @@ #include <linux/list.h> #include <linux/spinlock.h> -#include <dahdi/kernel.h> #include "xdefs.h" #define XFRAME_QUEUE_MARGIN 10 diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 2e325e7..563af82 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -1209,15 +1209,6 @@ wait_for_completion_timeout(struct completion *x, unsigned long timeout) #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 |