Backport from BEE

[bacula/bacula] / bacula / src / lib / workq.c

diff --git a/bacula/src/lib/workq.c b/bacula/src/lib/workq.c
index e3f751747edb1f245e7982a0b3bc18c03d126d52..6a754d1d29ce2de4b2c9417648e7c1f608406ca9 100644 (file)
--- a/bacula/src/lib/workq.c
+++ b/bacula/src/lib/workq.c
@@ -1,29 +1,17 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2001-2012 Free Software Foundation Europe e.V.
+   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.
-   This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version three of the GNU Affero General Public
-   License as published by the Free Software Foundation and included
-   in the file LICENSE.
+   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 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 Affero 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 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.
 */
 /*
  * Bacula work queue routines. Permits passing work to
@@ -310,16 +298,7 @@ void *workq_server(void *arg)
           * Wait 2 seconds, then if no more work, exit
           */
          Dmsg0(1400, "pthread_cond_timedwait()\n");
-#ifdef xxxxxxxxxxxxxxxx_was_HAVE_CYGWIN
-         /* CYGWIN dies with a page fault the second
-          * time that pthread_cond_timedwait() is called
-          * so fake it out.
-          */
-         P(wq->mutex);
-         stat = ETIMEDOUT;
-#else
          stat = pthread_cond_timedwait(&wq->work, &wq->mutex, &timeout);
-#endif
          Dmsg1(1400, "timedwait=%d\n", stat);
          if (stat == ETIMEDOUT) {
             timedout = 1;