diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-12-11 19:09:29 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-12-11 19:09:29 +0000 |
| commit | 1bfb68dfe23e791a6dacc7b59a65e6f5341c4973 (patch) | |
| tree | 83eca17243957f0a7078916c0fe1275aa5e0ba60 /xpp | |
| parent | ee074dba8e79e5f405700ba7907b58572fbea8cb (diff) | |
Merged revisions 1701 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
................
r1701 | kpfleming | 2006-12-11 13:07:58 -0600 (Mon, 11 Dec 2006) | 10 lines
Merged revisions 1700 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r1700 | kpfleming | 2006-12-11 13:05:43 -0600 (Mon, 11 Dec 2006) | 2 lines
kernel 2.6.19 now has a type called 'bool', although it's not completely implemented so there will still be some warnings when building xpp against 2.6.19 kernel headers
........
................
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1702 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'xpp')
| -rw-r--r-- | xpp/xdefs.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/xpp/xdefs.h b/xpp/xdefs.h index d7c7032..a68705c 100644 --- a/xpp/xdefs.h +++ b/xpp/xdefs.h @@ -25,6 +25,11 @@ #ifdef __KERNEL__ #include <linux/kernel.h> +#include <linux/version.h> + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) +#define LINUX26 +#endif #else @@ -95,7 +100,9 @@ struct list_head { struct list_head *next; struct list_head *prev; }; typedef char *charp; typedef unsigned char byte; +#if !defined(LINUX26) || (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)) typedef int bool; +#endif typedef struct xbus xbus_t; typedef struct xpd xpd_t; typedef struct xpacket_raw xpacket_raw_t; |