Merge branch 'master' into mvw/1361

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

diff --git a/bacula/src/lib/btimers.h b/bacula/src/lib/btimers.h
index f529784e796d1ec96a95f947b2f7dc8d1f4451af..ce1ad679b67388d84ff8e13d4101cf198d373f19 100644 (file)
--- a/bacula/src/lib/btimers.h
+++ b/bacula/src/lib/btimers.h
@@ -1,36 +1,48 @@
 /*
- * Process and thread timer routines, built on top of watchdogs.
- *
- *    Nic Bellamy <nic@bellamy.co.nz>, October 2003.
- *
-*/
-/*
-   Copyright (C) 2003-2004 Kern Sibbald and John Walker
+   Bacula® - The Network Backup Solution
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   Copyright (C) 2003-2007 Free Software Foundation Europe e.V.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   The main author of Bacula is Kern Sibbald, with contributions from
+   many others, a complete list can be found in the file AUTHORS.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version two of the GNU General Public
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
+
+   Bacula® is a registered trademark of Kern Sibbald.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
+/*
+ * Process and thread timer routines, built on top of watchdogs.
+ *
+ *    Nic Bellamy <nic@bellamy.co.nz>, October 2003.
+ *
+*/
 
- */
+#ifndef __BTIMERS_H_
+#define __BTIMERS_H_
 
-typedef struct s_btimer_t {
-   watchdog_t *wd;                   /* Parent watchdog */
+struct btimer_t {
+   watchdog_t *wd;                    /* Parent watchdog */
    int type;
    bool killed;
-   pid_t pid;                        /* process id if TYPE_CHILD */
-   pthread_t tid;                    /* thread id if TYPE_PTHREAD */
-   BSOCK *bsock;                     /* Pointer to BSOCK */
-} btimer_t;
+   pid_t pid;                         /* process id if TYPE_CHILD */
+   pthread_t tid;                     /* thread id if TYPE_PTHREAD */
+   BSOCK *bsock;                      /* Pointer to BSOCK */
+   JCR *jcr;                          /* Pointer to job control record */
+};
 
-/* EOF */
+#endif /* __BTIMERS_H_ */