Просмотр исходного кода

Change define for timer handle.

(Logical change 1.79)


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@279 fd59a12c-fef9-0310-b244-a6a79926bd2f
Steven Dake 21 лет назад
Родитель
Сommit
5ea980e5d0
2 измененных файлов с 4 добавлено и 6 удалено
  1. 3 5
      exec/aispoll.c
  2. 1 1
      exec/aispoll.h

+ 3 - 5
exec/aispoll.c

@@ -282,7 +282,6 @@ int poll_timer_add (
 	poll_timer_handle *timer_handle_out)
 {
 	struct poll_instance *poll_instance;
-	poll_timer_handle timer_handle;
 	int res = -1;
 	SaErrorT error;
 
@@ -292,11 +291,10 @@ int poll_timer_add (
 		goto error_exit;
 	}
 
-	timer_handle = (poll_timer_handle)timerlist_add_future (&poll_instance->timerlist,
-		timer_fn, data, msec_in_future);
+	timerlist_add_future (&poll_instance->timerlist,
+		timer_fn, data, msec_in_future, timer_handle_out);
 
-	if (timer_handle != 0) {
-		*timer_handle_out = timer_handle;
+	if (timer_handle_out != 0) {
 		res = 0;
 	}
 

+ 1 - 1
exec/aispoll.h

@@ -34,7 +34,7 @@
 #ifndef POLL_H_DEFINED
 #define POLL_H_DEFINED
 
-typedef unsigned int poll_timer_handle;
+typedef void * poll_timer_handle;
 typedef unsigned int poll_handle;
 
 poll_handle poll_create (void);