Backport from Bacula Enterprise

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

diff --git a/bacula/src/lib/btimers.h b/bacula/src/lib/btimers.h
index de7328b7701acce82cb972c381121e6a9ecd9af0..c43690d3132c507b83e2c441093dd512e5e4d3fb 100644 (file)
--- a/bacula/src/lib/btimers.h
+++ b/bacula/src/lib/btimers.h
@@ -1,31 +1,40 @@
+/*
+   Bacula(R) - The Network Backup Solution
+
+   Copyright (C) 2000-2015 Kern Sibbald
+   Copyright (C) 2003-2014 Free Software Foundation Europe e.V.
+
+   The original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
+
+   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.
+
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
+
+   Bacula(R) 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.
  *
 */
-/*
-   Copyright (C) 2000-2006 Kern Sibbald
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   version 2 as amended with additional clauses defined in the
-   file LICENSE in the main source directory.
-
-   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 
-   the file LICENSE for additional details.
 
- */
+#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_ */