Fix reporting jobs from state file + misc

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

diff --git a/bacula/src/lib/watchdog.h b/bacula/src/lib/watchdog.h
index aaae0c74cc6a935af7f002e827be388509fab3a3..04725cf0189a509bf716cbe37d8850cf342f3c39 100644 (file)
--- a/bacula/src/lib/watchdog.h
+++ b/bacula/src/lib/watchdog.h
@@ -5,7 +5,7 @@
  *
 */
 /*
-   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,23 +24,22 @@
 
  */
 
-#define TYPE_CHILD   1
-#define TYPE_PTHREAD 2
+enum {
+   TYPE_CHILD = 1,
+   TYPE_PTHREAD, 
+   TYPE_BSOCK 
+};
 
 #define TIMEOUT_SIGNAL SIGUSR2
 
-/* This breaks Kern's #include rules, but I don't want to put it into bacula.h
- * until it has been discussed with him */
-#include "bsd_queue.h"
-
 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 */
-       TAILQ_ENTRY(s_watchdog_t) qe;
-       time_t next_fire;
+        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;