[zaptel-commits] tzafrir: branch 1.4 r2920 - in /branches/1.4: ./ xpp/xbus-core.c

SVN commits to the Zaptel project zaptel-commits at lists.digium.com
Tue Aug 21 11:49:31 CDT 2007


Author: tzafrir
Date: Tue Aug 21 11:49:31 2007
New Revision: 2920

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2920
Log:
Fix building on kernel 2.6.23rc1, from Axel Thimm (xpp r4523).

Merged revisions 2919 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2

Modified:
    branches/1.4/   (props changed)
    branches/1.4/xpp/xbus-core.c

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

Modified: branches/1.4/xpp/xbus-core.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/xpp/xbus-core.c?view=diff&rev=2920&r1=2919&r2=2920
==============================================================================
--- branches/1.4/xpp/xbus-core.c (original)
+++ branches/1.4/xpp/xbus-core.c Tue Aug 21 11:49:31 2007
@@ -1281,7 +1281,10 @@
 	xframes_cache = kmem_cache_create("xpp_frames",
 			sizeof(xframe_t) + XFRAME_DATASIZE,
 			0, 0,
-			NULL, NULL);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
+			NULL, 
+#endif
+			NULL);
 	if(!xframes_cache) {
 		return -ENOMEM;
 	}




More information about the zaptel-commits mailing list