diff options
author | Max Kellermann <max@duempel.org> | 2014-07-02 20:07:08 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2014-07-02 20:09:39 +0200 |
commit | 56504534d8a5083aa4aef95df7bd5d83f96a5b1d (patch) | |
tree | c0e71486e9690f5edeef558d975b37b7441b5dcc /src/thread | |
parent | 80a45c91f9097571b291f3b73d78dad21d6043e4 (diff) | |
download | mpd-56504534d8a5083aa4aef95df7bd5d83f96a5b1d.tar.gz mpd-56504534d8a5083aa4aef95df7bd5d83f96a5b1d.tar.xz mpd-56504534d8a5083aa4aef95df7bd5d83f96a5b1d.zip |
thread/{Mutex,Cond}: relicense to BSD-2
Diffstat (limited to '')
-rw-r--r-- | src/thread/Cond.hxx | 40 | ||||
-rw-r--r-- | src/thread/CriticalSection.hxx | 4 | ||||
-rw-r--r-- | src/thread/Mutex.hxx | 40 | ||||
-rw-r--r-- | src/thread/PosixCond.hxx | 4 | ||||
-rw-r--r-- | src/thread/PosixMutex.hxx | 4 | ||||
-rw-r--r-- | src/thread/WindowsCond.hxx | 4 |
6 files changed, 58 insertions, 38 deletions
diff --git a/src/thread/Cond.hxx b/src/thread/Cond.hxx index 93d5deb74..a05d1c67d 100644 --- a/src/thread/Cond.hxx +++ b/src/thread/Cond.hxx @@ -1,24 +1,34 @@ /* - * Copyright (C) 2003-2014 The Music Player Daemon Project - * http://www.musicpd.org + * Copyright (C) 2009-2014 Max Kellermann <max@duempel.org> * - * 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. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * - * 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. + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * 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. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef MPD_THREAD_COND_HXX -#define MPD_THREAD_COND_HXX +#ifndef THREAD_COND_HXX +#define THREAD_COND_HXX #ifdef WIN32 diff --git a/src/thread/CriticalSection.hxx b/src/thread/CriticalSection.hxx index 8bc05b8f5..bb25f6c47 100644 --- a/src/thread/CriticalSection.hxx +++ b/src/thread/CriticalSection.hxx @@ -27,8 +27,8 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef MPD_THREAD_CRITICAL_SECTION_HXX -#define MPD_THREAD_CRITICAL_SECTION_HXX +#ifndef THREAD_CRITICAL_SECTION_HXX +#define THREAD_CRITICAL_SECTION_HXX #include <windows.h> diff --git a/src/thread/Mutex.hxx b/src/thread/Mutex.hxx index dbf3fb7fe..c17538549 100644 --- a/src/thread/Mutex.hxx +++ b/src/thread/Mutex.hxx @@ -1,24 +1,34 @@ /* - * Copyright (C) 2003-2014 The Music Player Daemon Project - * http://www.musicpd.org + * Copyright (C) 2009-2014 Max Kellermann <max@duempel.org> * - * 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. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * - * 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. + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * 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. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef MPD_THREAD_MUTEX_HXX -#define MPD_THREAD_MUTEX_HXX +#ifndef THREAD_MUTEX_HXX +#define THREAD_MUTEX_HXX #ifdef WIN32 diff --git a/src/thread/PosixCond.hxx b/src/thread/PosixCond.hxx index 35aa8c88a..e0d6623dd 100644 --- a/src/thread/PosixCond.hxx +++ b/src/thread/PosixCond.hxx @@ -27,8 +27,8 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef MPD_THREAD_POSIX_COND_HXX -#define MPD_THREAD_POSIX_COND_HXX +#ifndef THREAD_POSIX_COND_HXX +#define THREAD_POSIX_COND_HXX #include "PosixMutex.hxx" diff --git a/src/thread/PosixMutex.hxx b/src/thread/PosixMutex.hxx index 464ed5787..9d1674dd4 100644 --- a/src/thread/PosixMutex.hxx +++ b/src/thread/PosixMutex.hxx @@ -27,8 +27,8 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef MPD_THREAD_POSIX_MUTEX_HXX -#define MPD_THREAD_POSIX_MUTEX_HXX +#ifndef THREAD_POSIX_MUTEX_HXX +#define THREAD_POSIX_MUTEX_HXX #include <pthread.h> diff --git a/src/thread/WindowsCond.hxx b/src/thread/WindowsCond.hxx index c05bc05b2..2ce7271b9 100644 --- a/src/thread/WindowsCond.hxx +++ b/src/thread/WindowsCond.hxx @@ -27,8 +27,8 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef MPD_THREAD_WINDOWS_COND_HXX -#define MPD_THREAD_WINDOWS_COND_HXX +#ifndef THREAD_WINDOWS_COND_HXX +#define THREAD_WINDOWS_COND_HXX #include "CriticalSection.hxx" |