diff options
| author | Stephen Leake | 2019-04-14 09:24:42 -0700 |
|---|---|---|
| committer | Stephen Leake | 2019-04-14 09:24:42 -0700 |
| commit | 5ee5895f9b7b829783bc0f217095748076cc77e9 (patch) | |
| tree | 82eb5163502b447425eba24d2d368e878813ab77 /lib | |
| parent | ca449fb1c1f86589cbf4da49cda1750ffdb2cad4 (diff) | |
| parent | 890440a44cd5f4f09742f521c7783785d114fffc (diff) | |
| download | emacs-5ee5895f9b7b829783bc0f217095748076cc77e9.tar.gz emacs-5ee5895f9b7b829783bc0f217095748076cc77e9.zip | |
Merge commit '890440a44cd5f4f09742f521c7783785d114fffc'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/_Noreturn.h | 16 | ||||
| -rw-r--r-- | lib/gnulib.mk.in | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/lib/_Noreturn.h b/lib/_Noreturn.h index 7594e4b0c0b..db9b45554c5 100644 --- a/lib/_Noreturn.h +++ b/lib/_Noreturn.h | |||
| @@ -1,3 +1,19 @@ | |||
| 1 | /* A C macro for declaring that a function does not return. | ||
| 2 | Copyright (C) 2011-2019 Free Software Foundation, Inc. | ||
| 3 | |||
| 4 | This program is free software: you can redistribute it and/or modify it | ||
| 5 | under the terms of the GNU General Public License as published | ||
| 6 | by the Free Software Foundation; either version 3 of the License, or | ||
| 7 | (at your option) any later version. | ||
| 8 | |||
| 9 | This program is distributed in the hope that it will be useful, | ||
| 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 12 | General Public License for more details. | ||
| 13 | |||
| 14 | You should have received a copy of the GNU General Public License | ||
| 15 | along with this program. If not, see <https://www.gnu.org/licenses/>. */ | ||
| 16 | |||
| 1 | #ifndef _Noreturn | 17 | #ifndef _Noreturn |
| 2 | # if (defined __cplusplus \ | 18 | # if (defined __cplusplus \ |
| 3 | && ((201103 <= __cplusplus && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) \ | 19 | && ((201103 <= __cplusplus && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) \ |
diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in index 0d9a885be3d..1450df9f638 100644 --- a/lib/gnulib.mk.in +++ b/lib/gnulib.mk.in | |||
| @@ -179,6 +179,7 @@ CAIRO_LIBS = @CAIRO_LIBS@ | |||
| 179 | CC = @CC@ | 179 | CC = @CC@ |
| 180 | CFLAGS = @CFLAGS@ | 180 | CFLAGS = @CFLAGS@ |
| 181 | CFLAGS_SOUND = @CFLAGS_SOUND@ | 181 | CFLAGS_SOUND = @CFLAGS_SOUND@ |
| 182 | CHECK_STRUCTS = @CHECK_STRUCTS@ | ||
| 182 | CLIENTRES = @CLIENTRES@ | 183 | CLIENTRES = @CLIENTRES@ |
| 183 | CLIENTW = @CLIENTW@ | 184 | CLIENTW = @CLIENTW@ |
| 184 | CM_OBJ = @CM_OBJ@ | 185 | CM_OBJ = @CM_OBJ@ |