From 799f30f3854a30569bb356d1640c0e3f11de0be2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Thu, 23 Jan 2014 10:49:57 +0000 Subject: [PATCH] c11: Update docs/license.html and include verbatim copy of Boost license. --- docs/license.html | 3 +++ include/c11/threads.h | 23 ++++++++++++++++++++++- include/c11/threads_posix.h | 23 ++++++++++++++++++++++- include/c11/threads_win32.h | 23 ++++++++++++++++++++++- 4 files changed, 69 insertions(+), 3 deletions(-) diff --git a/docs/license.html b/docs/license.html index 80bb60400ba..d56823f6dd1 100644 --- a/docs/license.html +++ b/docs/license.html @@ -103,6 +103,9 @@ Device drivers src/mesa/drivers/* MIT, generally Ext headers include/GL/glext.h Khronos include/GL/glxext.h + +C11 thread include/c11/threads*.h Boost (permissive) +emulation

diff --git a/include/c11/threads.h b/include/c11/threads.h index 4bb78b6500d..45823df35b2 100644 --- a/include/c11/threads.h +++ b/include/c11/threads.h @@ -3,7 +3,28 @@ * * (C) Copyright yohhoy 2012. * Distributed under the Boost Software License, Version 1.0. - * (See copy at http://www.boost.org/LICENSE_1_0.txt) + * + * Permission is hereby granted, free of charge, to any person or organization + * obtaining a copy of the software and accompanying documentation covered by + * this license (the "Software") to use, reproduce, display, distribute, + * execute, and transmit the Software, and to prepare [[derivative work]]s of the + * Software, and to permit third-parties to whom the Software is furnished to + * do so, all subject to the following: + * + * The copyright notices in the Software and this entire statement, including + * the above license grant, this restriction and the following disclaimer, + * must be included in all copies of the Software, in whole or in part, and + * all derivative works of the Software, unless such copies or derivative + * works are solely in the form of machine-executable object code generated by + * a source language processor. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. */ #ifndef EMULATED_THREADS_H_INCLUDED_ #define EMULATED_THREADS_H_INCLUDED_ diff --git a/include/c11/threads_posix.h b/include/c11/threads_posix.h index 463c93f45c9..047e2eae55c 100644 --- a/include/c11/threads_posix.h +++ b/include/c11/threads_posix.h @@ -3,7 +3,28 @@ * * (C) Copyright yohhoy 2012. * Distributed under the Boost Software License, Version 1.0. - * (See copy at http://www.boost.org/LICENSE_1_0.txt) + * + * Permission is hereby granted, free of charge, to any person or organization + * obtaining a copy of the software and accompanying documentation covered by + * this license (the "Software") to use, reproduce, display, distribute, + * execute, and transmit the Software, and to prepare [[derivative work]]s of the + * Software, and to permit third-parties to whom the Software is furnished to + * do so, all subject to the following: + * + * The copyright notices in the Software and this entire statement, including + * the above license grant, this restriction and the following disclaimer, + * must be included in all copies of the Software, in whole or in part, and + * all derivative works of the Software, unless such copies or derivative + * works are solely in the form of machine-executable object code generated by + * a source language processor. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. */ #include #include diff --git a/include/c11/threads_win32.h b/include/c11/threads_win32.h index 5a63e90b3a7..ee29460252f 100644 --- a/include/c11/threads_win32.h +++ b/include/c11/threads_win32.h @@ -3,7 +3,28 @@ * * (C) Copyright yohhoy 2012. * Distributed under the Boost Software License, Version 1.0. - * (See copy at http://www.boost.org/LICENSE_1_0.txt) + * + * Permission is hereby granted, free of charge, to any person or organization + * obtaining a copy of the software and accompanying documentation covered by + * this license (the "Software") to use, reproduce, display, distribute, + * execute, and transmit the Software, and to prepare [[derivative work]]s of the + * Software, and to permit third-parties to whom the Software is furnished to + * do so, all subject to the following: + * + * The copyright notices in the Software and this entire statement, including + * the above license grant, this restriction and the following disclaimer, + * must be included in all copies of the Software, in whole or in part, and + * all derivative works of the Software, unless such copies or derivative + * works are solely in the form of machine-executable object code generated by + * a source language processor. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. */ #include #include -- 2.30.2