Backport from Bacula Enterprise

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

diff --git a/bacula/src/lib/waitq.h b/bacula/src/lib/waitq.h
index 69a69274e3456fc276dd82ab36b22d76e08c9919..4059ee31d2a25bf2c1aefd2269819dab516f3d3f 100644 (file)
--- a/bacula/src/lib/waitq.h
+++ b/bacula/src/lib/waitq.h
@@ -1,30 +1,32 @@
 /*
- * Bacula wait queue routines. Permits waiting for something
- *   to be done. I.e. for operator to mount new volume.
- *
- *  Kern Sibbald, March MMI
- *
- *  This code inspired from "Programming with POSIX Threads", by
- *    David R. Butenhof
- *
- *   Version $Id$
- *
- */
-/*
-   Bacula® - The Network Backup Solution
+   Bacula(R) - The Network Backup Solution
 
+   Copyright (C) 2000-2015 Kern Sibbald
    Copyright (C) 2001-2014 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.
+   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.
 
-   Bacula® is a registered trademark of Kern Sibbald.
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
 */
+/*
+ * Bacula wait queue routines. Permits waiting for something
+ *   to be done. I.e. for operator to mount new volume.
+ *
+ *  Kern Sibbald, March MMI
+ *
+ *  This code inspired from "Programming with POSIX Threads", by
+ *    David R. Butenhof
+ *
+ */
 
 #ifndef __WAITQ_H
 #define __WAITQ_H 1