diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2010-02-26 16:40:40 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2010-02-26 16:40:40 +0000 |
| commit | 0e66db059265bf2085413fe93f76957abf945e95 (patch) | |
| tree | 9682bd850940492e519f01673897cc3be56ffedd | |
| parent | 00d2851a04a8f7fc4a34b91d2c9455748f973ca9 (diff) | |
dahdi: Move the definition of bool from xdefs.h into include/dahdi/kernel.h
I intend to use the bool definition in the wctdm24xxp driver and don't want to
duplicate the definition.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@8117 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, 10 insertions, 8 deletions
diff --git a/drivers/dahdi/xpp/xdefs.h b/drivers/dahdi/xpp/xdefs.h index 24b2291..482a8ee 100644 --- a/drivers/dahdi/xpp/xdefs.h +++ b/drivers/dahdi/xpp/xdefs.h @@ -144,14 +144,6 @@ 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 eba94dd..2c345b4 100644 --- a/drivers/dahdi/xpp/xframe_queue.h +++ b/drivers/dahdi/xpp/xframe_queue.h @@ -3,6 +3,7 @@ #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 563af82..2e325e7 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -1209,6 +1209,15 @@ 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 |