[asterisk-commits] mmichelson: branch mmichelson/res_timing_timerfd r155552 - in /team/mmichelso...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Sat Nov  8 17:57:14 2008
New Revision: 155552

URL: http://svn.digium.com/view/asterisk?view=rev&rev=155552
Log:
Fix compile errors to keep up with API change to astobj2

Modified:
    team/mmichelson/res_timing_timerfd/autoconf/ast_c_compile_check.m4
    team/mmichelson/res_timing_timerfd/configure
    team/mmichelson/res_timing_timerfd/res/res_timing_timerfd.c

Modified: team/mmichelson/res_timing_timerfd/autoconf/ast_c_compile_check.m4
URL: http://svn.digium.com/view/asterisk/team/mmichelson/res_timing_timerfd/autoconf/ast_c_compile_check.m4?view=diff&rev=155552&r1=155551&r2=155552
==============================================================================
--- team/mmichelson/res_timing_timerfd/autoconf/ast_c_compile_check.m4 (original)
+++ team/mmichelson/res_timing_timerfd/autoconf/ast_c_compile_check.m4 Sat Nov  8 17:57:14 2008
@@ -27,6 +27,7 @@
 	    [       AC_MSG_RESULT(no) ] 
 	)
 	AC_SUBST(PBX_$1)
+	AC_SUBST($1_INCLUDE)
 	CPPFLAGS="${saved_cppflags}"
     fi
 ])

Modified: team/mmichelson/res_timing_timerfd/res/res_timing_timerfd.c
URL: http://svn.digium.com/view/asterisk/team/mmichelson/res_timing_timerfd/res/res_timing_timerfd.c?view=diff&rev=155552&r1=155551&r2=155552
==============================================================================
--- team/mmichelson/res_timing_timerfd/res/res_timing_timerfd.c (original)
+++ team/mmichelson/res_timing_timerfd/res/res_timing_timerfd.c Sat Nov  8 17:57:14 2008
@@ -78,7 +78,7 @@
 	return timer->handle;
 }
 
-static int timerfd_timer_cmp(void *obj, void *args, int flags)
+static int timerfd_timer_cmp(void *obj, void *args, void *data, int flags)
 {
 	struct timerfd_timer *timer1 = obj, *timer2 = args;
 	return timer1->handle == timer2->handle ? CMP_MATCH | CMP_STOP : 0;
@@ -117,7 +117,7 @@
 		.handle = handle,
 	};
 
-	if (!(our_timer = ao2_find(timerfd_timers, &find_helper, OBJ_POINTER))) {
+	if (!(our_timer = ao2_find(timerfd_timers, &find_helper, NULL, OBJ_POINTER))) {
 		ast_log(LOG_ERROR, "Couldn't find timer with handle %d\n", handle);
 		return;
 	}
@@ -167,7 +167,7 @@
 		.handle = handle,
 	};
 
-	if (!(our_timer = ao2_find(timerfd_timers, &find_helper, OBJ_POINTER))) {
+	if (!(our_timer = ao2_find(timerfd_timers, &find_helper, NULL, OBJ_POINTER))) {
 		ast_log(LOG_ERROR, "Couldn't find timer with handle %d\n", handle);
 		return -1;
 	}
@@ -196,7 +196,7 @@
 		.handle = handle,
 	};
 
-	if (!(our_timer = ao2_find(timerfd_timers, &find_helper, OBJ_POINTER))) {
+	if (!(our_timer = ao2_find(timerfd_timers, &find_helper, NULL, OBJ_POINTER))) {
 		ast_log(LOG_ERROR, "Couldn't find timer with handle %d\n", handle);
 		return -1;
 	}
@@ -223,7 +223,7 @@
 		.handle = handle,
 	};
 
-	if (!(our_timer = ao2_find(timerfd_timers, &find_helper, OBJ_POINTER))) {
+	if (!(our_timer = ao2_find(timerfd_timers, &find_helper, NULL, OBJ_POINTER))) {
 		ast_log(LOG_ERROR, "Couldn't find timer with handle %d\n", handle);
 		return -1;
 	}