[zaptel-commits] kpfleming: branch 1.4 r1701 - in /branches/1.4: ./ xpp/xdefs.h

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Mon Dec 11 13:07:58 2006
New Revision: 1701

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

........

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

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

Modified: branches/1.4/xpp/xdefs.h
URL: http://svn.digium.com/view/zaptel/branches/1.4/xpp/xdefs.h?view=diff&rev=1701&r1=1700&r2=1701
==============================================================================
--- branches/1.4/xpp/xdefs.h (original)
+++ branches/1.4/xpp/xdefs.h Mon Dec 11 13:07:58 2006
@@ -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 @@
 
 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;