diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-09-10 08:39:55 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-09-10 08:40:43 -0700 |
| commit | b079ee72ac25590cd8b7b185b32ea5d2d43a9909 (patch) | |
| tree | bbd4f1a2a0524ce1e380019d7d2b59a5c18f0844 /lib/flexmember.h | |
| parent | c990f8d93dcc78aa98e58b89bddb666efcea2710 (diff) | |
| download | emacs-b079ee72ac25590cd8b7b185b32ea5d2d43a9909.tar.gz emacs-b079ee72ac25590cd8b7b185b32ea5d2d43a9909.tar.bz2 emacs-b079ee72ac25590cd8b7b185b32ea5d2d43a9909.zip | |
Merge from gnulib
This incorporates:
2017-09-08 stddef: Avoid conflict with system-defined max_align_t
2017-08-24 warnings: fix compilation with old autoconf
2017-08-23 glob: merge from glibc with Zanella glob changes
2017-08-17 random: Fix test compilation failure on Cygwin 1.5.25
* doc/misc/texinfo.tex, lib/flexmember.h, lib/stddef.in.h:
* lib/stdlib.in.h, m4/manywarnings.m4, m4/stdlib_h.m4:
* m4/warnings.m4:
Copy from Gnulib.
* lib/gnulib.mk.in: Regenerate.
Diffstat (limited to 'lib/flexmember.h')
| -rw-r--r-- | lib/flexmember.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/lib/flexmember.h b/lib/flexmember.h index c71ea651036..7405c418382 100644 --- a/lib/flexmember.h +++ b/lib/flexmember.h @@ -2,18 +2,21 @@ Copyright 2016-2017 Free Software Foundation, Inc. - 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. + This file is part of the GNU C Library. - This program is distributed in the hope that it will be useful, + The GNU C Library 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. + + 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 General Public License for more details. + 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/>. + You should have received a copy of the GNU General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. Written by Paul Eggert. */ |