[zaptel-commits] kpfleming: branch 1.2 r2190 - in /branches/1.2: Makefile hpec/hpec_zaptel.h

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Tue Feb 20 22:40:34 2007
New Revision: 2190

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2190
Log:
fix HPEC builds on 2.4 kernels

Modified:
    branches/1.2/Makefile
    branches/1.2/hpec/hpec_zaptel.h

Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile?view=diff&rev=2190&r1=2189&r2=2190
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Tue Feb 20 22:40:34 2007
@@ -164,7 +164,7 @@
 ZAPTEL_HPEC:=hpec/hpec_x86_64.o_shipped
 endif
 
-CFLAGS+=-DECHO_CAN_HPEC -I$(PWD)/hpec
+KFLAGS+=-DECHO_CAN_HPEC -I$(PWD)/hpec
 zaptel-base.o: hpec/hpec_zaptel.h hpec/hpec_user.h
 endif
 

Modified: branches/1.2/hpec/hpec_zaptel.h
URL: http://svn.digium.com/view/zaptel/branches/1.2/hpec/hpec_zaptel.h?view=diff&rev=2190&r1=2189&r2=2190
==============================================================================
--- branches/1.2/hpec/hpec_zaptel.h (original)
+++ branches/1.2/hpec/hpec_zaptel.h Tue Feb 20 22:40:34 2007
@@ -33,9 +33,18 @@
 	int res;
 	va_list args;
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 	va_start(args, format);
 	res = vprintk(format, args);
 	va_end(args);
+#else
+	char buf[256];
+
+	va_start(args, format);
+	res = vsnprintf(buf, sizeof(buf), format, args);
+	va_end(args);
+	printk(buf);
+#endif
 
 	return res;
 }