Backport from BEE

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

diff --git a/bacula/src/lib/btimers.h b/bacula/src/lib/btimers.h
index 51329d495b513511b9debd28c47008df121474dc..a638aa5815e6707656ffbc6ead7d921596f23877 100644 (file)
--- a/bacula/src/lib/btimers.h
+++ b/bacula/src/lib/btimers.h
@@ -1,44 +1,36 @@
-/*
- * Process and thread timer routines, built on top of watchdogs.
- *
- *    Nic Bellamy <nic@bellamy.co.nz>, October 2003.
- *
-*/
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2003-2006 Free Software Foundation Europe e.V.
-
-   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 plus additions
-   that are listed in the file LICENSE.
+   Copyright (C) 2003-2014 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
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
+   The main author of Bacula is Kern Sibbald, with contributions from many
+   others, a complete list can be found in the file AUTHORS.
 
-   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.
+   You may use this file and others of this release according to the
+   license defined in the LICENSE file, which includes the Affero General
+   Public License, v3.0 ("AGPLv3") and some additional permissions and
+   terms pursuant to its AGPLv3 Section 7.
 
-   Bacula® is a registered trademark of John Walker.
-   The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
-   Switzerland, email:ftf@fsfeurope.org.
+   Bacula® is a registered trademark of Kern Sibbald.
 */
+/*
+ * 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 {
+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;
+   JCR *jcr;                          /* Pointer to job control record */
+};
 
-/* EOF */
+#endif /* __BTIMERS_H_ */