[zaptel-commits] tzafrir: branch 1.4 r1726 - in /branches/1.4/xpp: ./ xpd.h

[zaptel-commits at lists.digium.com]

Author: tzafrir
Date: Mon Dec 18 07:58:51 2006
New Revision: 1726

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1726
Log:
 r1721 at boole:  tzafrir | 2006-12-18 15:46:42 +0200
 Assume every 2.6.9 kernel is a later RHEL4 kernel, which backported
 the gfp_t typedef. Either way we break some systems).
 
 r2938:  diego | 2006-12-17 14:22:16 +0200

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

Propchange: branches/1.4/xpp/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Dec 18 07:58:51 2006
@@ -1,5 +1,5 @@
 283159da-0705-0410-b60c-f2062b4bb6ad:/components/xpp-zaptel/branches/RELEASE-1.2.0/xpp:2933
 283159da-0705-0410-b60c-f2062b4bb6ad:/components/xpp-zaptel/trunk/xpp:2830
-f558416c-6c06-0410-9f27-dde2687782d0:/branches/1.2/xpp:1718
+f558416c-6c06-0410-9f27-dde2687782d0:/branches/1.2/xpp:1721
 f558416c-6c06-0410-9f27-dde2687782d0:/team/tzafrir/xpp_1.2/xpp:1554
 f558416c-6c06-0410-9f27-dde2687782d0:/trunk/xpp:1453

Modified: branches/1.4/xpp/xpd.h
URL: http://svn.digium.com/view/zaptel/branches/1.4/xpp/xpd.h?view=diff&rev=1726&r1=1725&r2=1726
==============================================================================
--- branches/1.4/xpp/xpd.h (original)
+++ branches/1.4/xpp/xpd.h Mon Dec 18 07:58:51 2006
@@ -38,7 +38,10 @@
 
 #ifdef __KERNEL__
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+/* pretend every 2.6.9 is later RHEL */
+#if LINUX_VERSION_CODE != KERNEL_VERSION(2,6,9) 
 typedef	unsigned gfp_t;		/* Added in 2.6.14 */
+#endif
 #endif
 #define	DEF_PARM(type,name,init,desc)	\
 	type name = init;	\