diff options
author | Richard Braun <rbraun@sceen.net> | 2016-06-02 17:21:33 +0200 |
---|---|---|
committer | Richard Braun <rbraun@sceen.net> | 2016-06-02 17:41:33 +0200 |
commit | d9cdc4bfefde848403a05fc3d342822c04a015bc (patch) | |
tree | cdae6561b1998e0e1b218ca9d3449b8a72847888 /kern | |
parent | 8fa8d662a339a1d0951c58a4f35d8865d12d00cc (diff) | |
download | gnumach-d9cdc4bfefde848403a05fc3d342822c04a015bc.tar.gz gnumach-d9cdc4bfefde848403a05fc3d342822c04a015bc.tar.bz2 gnumach-d9cdc4bfefde848403a05fc3d342822c04a015bc.zip |
Fix some license headers.
As the original author of the files imported, I explicitely dual
license them to something compatible with GPLv2.
kern/macros.h: Switch license from GPLv3 to BSD 2-clause.
kern/rdxtree_i.h: Likewise.
Diffstat (limited to 'kern')
-rw-r--r-- | kern/macros.h | 35 | ||||
-rw-r--r-- | kern/rdxtree_i.h | 32 |
2 files changed, 43 insertions, 24 deletions
diff --git a/kern/macros.h b/kern/macros.h index c2e8545a..01deab68 100644 --- a/kern/macros.h +++ b/kern/macros.h @@ -1,21 +1,32 @@ /* - * Copyright (c) 2009, 2010, 2013 Richard Braun. + * Copyright (c) 2009-2015 Richard Braun. + * All rights reserved. * - * 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 3 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: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. 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 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 General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. * * * Helper macros. + * + * Upstream site with license notes : + * http://git.sceen.net/rbraun/librbraun.git/ */ #ifndef _KERN_MACROS_H diff --git a/kern/rdxtree_i.h b/kern/rdxtree_i.h index 1bd1f64a..d9a59bf2 100644 --- a/kern/rdxtree_i.h +++ b/kern/rdxtree_i.h @@ -1,18 +1,26 @@ /* - * Copyright (c) 2013-2015 Richard Braun. + * Copyright (c) 2011-2015 Richard Braun. + * All rights reserved. * - * 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 3 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: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. 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 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 General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. * * * Upstream site with license notes : |