[svn-commits] branch 1.2 - r909 /branches/1.2/ztdummy.c

[svn-commits at lists.digium.com]

Author: russell
Date: Wed Jan 18 22:33:13 2006
New Revision: 909

URL: http://svn.digium.com/view/zaptel?rev=909&view=rev
Log:
fix symbol conflict with the kernel's rtc_interrupt function (issue #6287)

Modified:
    branches/1.2/ztdummy.c

Modified: branches/1.2/ztdummy.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/ztdummy.c?rev=909&r1=908&r2=909&view=diff
==============================================================================
--- branches/1.2/ztdummy.c (original)
+++ branches/1.2/ztdummy.c Wed Jan 18 22:33:13 2006
@@ -129,7 +129,7 @@
 #ifdef LINUX26
 #ifdef USE_RTC
 /* rtc_interrupt - called at 1024Hz from hook in RTC handler */
-static void rtc_interrupt(void *private_data)
+static void ztdummy_rtc_interrupt(void *private_data)
 {
 	struct ztdummy *ztd = private_data;
 	unsigned int ticks;
@@ -244,7 +244,7 @@
 #ifdef LINUX26
 #ifdef USE_RTC
     atomic_set(&ztd->ticks, 0);
-    ztd->rtc_task.func = rtc_interrupt;
+    ztd->rtc_task.func = ztdummy_rtc_interrupt;
     ztd->rtc_task.private_data = ztd;
     err = rtc_register(&ztd->rtc_task);
     if (err < 0) {