Tweak Win32 build

[bacula/bacula] / bacula / src / lib / watchdog.h

diff --git a/bacula/src/lib/watchdog.h b/bacula/src/lib/watchdog.h
index 8d39d38bda8d1254e3559f48169012987cb36086..c8e1cebb582297dedf58a3d713a6f78867206543 100644 (file)
--- a/bacula/src/lib/watchdog.h
+++ b/bacula/src/lib/watchdog.h
@@ -1,11 +1,11 @@
 /*
  * Watchdog timer routines
- * 
+ *
  *    Kern Sibbald, December MMII
  *
 */
 /*
-   Copyright (C) 2002 Kern Sibbald and John Walker
+   Copyright (C) 2002-2004 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -24,20 +24,22 @@
 
  */
 
-#define TYPE_CHILD   1
-#define TYPE_PTHREAD 2
+enum {
+   TYPE_CHILD = 1,
+   TYPE_PTHREAD,
+   TYPE_BSOCK
+};
 
 #define TIMEOUT_SIGNAL SIGUSR2
 
-typedef struct s_btimer_t {
-   struct s_btimer_t *next;
-   struct s_btimer_t *prev;
-   time_t start_time;
-   int32_t  wait;
-   pid_t pid;                        /* process id if TYPE_CHILD */
-   int killed;
-   int type;
-   pthread_t tid;                    /* thread id if TYPE_PTHREAD */
-} btimer_t;
-
-#define btimer_id btimer_t *
+struct s_watchdog_t {
+       bool one_shot;
+       time_t interval;
+       void (*callback)(struct s_watchdog_t *wd);
+       void (*destructor)(struct s_watchdog_t *wd);
+       void *data;
+       /* Private data below - don't touch outside of watchdog.c */
+       dlink link;
+       time_t next_fire;
+};
+typedef struct s_watchdog_t watchdog_t;