diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-09-27 11:26:05 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-09-27 15:41:01 +0200 |
| commit | 28006b2f336dcad2bda969a74dba28084dd82482 (patch) | |
| tree | 0b1f9620b12054d3e7de6d8acfb682eb007c2283 /debug | |
| parent | 79a1076d7867b901d5af85e802d4118f667d6b8b (diff) | |
| parent | 315970f6ca97a589c9220ed5481dbe000137373d (diff) | |
| download | glibc-28006b2f336dcad2bda969a74dba28084dd82482.tar.xz glibc-28006b2f336dcad2bda969a74dba28084dd82482.zip | |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'debug')
| -rw-r--r-- | debug/stack_chk_fail_local.c | 17 | ||||
| -rw-r--r-- | debug/warning-nop.c | 17 |
2 files changed, 34 insertions, 0 deletions
diff --git a/debug/stack_chk_fail_local.c b/debug/stack_chk_fail_local.c index de0de8f397..113088d55e 100644 --- a/debug/stack_chk_fail_local.c +++ b/debug/stack_chk_fail_local.c @@ -6,6 +6,23 @@ License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. + In addition to the permissions in the GNU Lesser General Public + License, the Free Software Foundation gives you unlimited + permission to link the compiled version of this file with other + programs, and to distribute those programs without any restriction + coming from the use of this file. (The GNU Lesser General Public + License restrictions do apply in other respects; for example, they + cover modification of the file, and distribution when not linked + into another program.) + + Note that people who make modified versions of this file are not + obligated to grant this special exception for their modified + versions; it is their choice whether to do so. The GNU Lesser + General Public License gives permission to release a modified + version without this exception; this exception also makes it + possible to release a modified version which carries forward this + exception. + The GNU C Library 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 diff --git a/debug/warning-nop.c b/debug/warning-nop.c index 8f2f66e16a..74df8e7c58 100644 --- a/debug/warning-nop.c +++ b/debug/warning-nop.c @@ -7,6 +7,23 @@ License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. + In addition to the permissions in the GNU Lesser General Public + License, the Free Software Foundation gives you unlimited + permission to link the compiled version of this file with other + programs, and to distribute those programs without any restriction + coming from the use of this file. (The GNU Lesser General Public + License restrictions do apply in other respects; for example, they + cover modification of the file, and distribution when not linked + into another program.) + + Note that people who make modified versions of this file are not + obligated to grant this special exception for their modified + versions; it is their choice whether to do so. The GNU Lesser + General Public License gives permission to release a modified + version without this exception; this exception also makes it + possible to release a modified version which carries forward this + exception. + The GNU C Library 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 |