[zaptel-commits] kpfleming: trunk r1702 - in /trunk: ./ xpp/xdefs.h

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Mon Dec 11 13:09:29 2006
New Revision: 1702

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

........

................

Modified:
    trunk/   (props changed)
    trunk/xpp/xdefs.h

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Mon Dec 11 13:09:29 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701

Modified: trunk/xpp/xdefs.h
URL: http://svn.digium.com/view/zaptel/trunk/xpp/xdefs.h?view=diff&rev=1702&r1=1701&r2=1702
==============================================================================
--- trunk/xpp/xdefs.h (original)
+++ trunk/xpp/xdefs.h Mon Dec 11 13:09:29 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;