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

Install the timer.h file so it can be used by
external services and remove a dependency on tlist.h



git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1384 fd59a12c-fef9-0310-b244-a6a79926bd2f

Patrick Caulfield 18 лет назад
Родитель
Сommit
5e056ec1a2
2 измененных файлов с 5 добавлено и 6 удалено
  1. 1 0
      Makefile
  2. 4 6
      exec/timer.h

+ 1 - 0
Makefile

@@ -188,6 +188,7 @@ endif
 	install -m 644 lcr/lcr_comp.h $(DESTDIR)$(INCLUDEDIR_LCR)
 	install -m 644 lcr/lcr_ifact.h $(DESTDIR)$(INCLUDEDIR_LCR)
 	install -m 644 exec/service.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
+	install -m 644 exec/timer.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
 	install -m 644 exec/objdb.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
 	install -m 644 exec/print.h $(DESTDIR)$(INCLUDEDIR_SERVICE)
 	install -m 644 exec/config.h $(DESTDIR)$(INCLUDEDIR_SERVICE)

+ 4 - 6
exec/timer.h

@@ -35,8 +35,6 @@
 #ifndef TIMER_H_DEFINED
 #define TIMER_H_DEFINED
 
-#include "tlist.h"
-
 typedef void * openais_timer_handle;
 
 extern void openais_timer_init (
@@ -47,17 +45,17 @@ extern int openais_timer_add_duration (
 	unsigned long long nanoseconds_in_future,
 	void *data,
 	void (*timer_fn) (void *data),
-	timer_handle *handle);
+	openais_timer_handle *handle);
 
 extern int openais_timer_add_absolute (
 	unsigned long long nanoseconds_from_epoch,
 	void *data,
 	void (*timer_fn) (void *data),
-	timer_handle *handle);
+	openais_timer_handle *handle);
 
-extern void openais_timer_delete (timer_handle timer_handle);
+extern void openais_timer_delete (openais_timer_handle timer_handle);
 
-extern void openais_timer_delete_data (timer_handle timer_handle);
+extern void openais_timer_delete_data (openais_timer_handle timer_handle);
 
 extern void openais_timer_lock (void);