diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | gnulib-local/lib/xalloc.h | 9 | ||||
| -rw-r--r-- | gnulib-local/modules/xalloc | 1 | ||||
| -rw-r--r-- | libtextstyle/.gitignore | 1 |
4 files changed, 6 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index 01dbbb8bb..102c17d22 100644 --- a/.gitignore +++ b/.gitignore @@ -178,6 +178,7 @@ /gettext-tools/libgettextpo/msvc-inval.h /gettext-tools/libgettextpo/msvc-nothrow.c /gettext-tools/libgettextpo/msvc-nothrow.h +/gettext-tools/libgettextpo/noreturn.h /gettext-tools/libgettextpo/obstack.c /gettext-tools/libgettextpo/obstack.h /gettext-tools/libgettextpo/open.c diff --git a/gnulib-local/lib/xalloc.h b/gnulib-local/lib/xalloc.h index b512cc8eb..460d06c69 100644 --- a/gnulib-local/lib/xalloc.h +++ b/gnulib-local/lib/xalloc.h @@ -1,5 +1,5 @@ /* malloc with out of memory checking. - Copyright (C) 2001-2004, 2006, 2019 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006, 2019-2020 Free Software Foundation, Inc. Written by Bruno Haible <haible@clisp.cons.org>, 2001. This program is free software: you can redistribute it and/or modify @@ -20,6 +20,7 @@ #include <stddef.h> +#include "noreturn.h" #include "xalloc-oversized.h" @@ -78,11 +79,7 @@ extern "C" { in charge of honoring the three previous items. This is the function to call when one wants the program to die because of a memory allocation failure. */ -extern void xalloc_die (void) -#if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5)) && !__STRICT_ANSI__ - __attribute__ ((__noreturn__)) -#endif - ; +_GL_NORETURN_FUNC extern void xalloc_die (void); /* In the following macros, T must be an elementary or structure/union or typedef'ed type, or a pointer to such a type. To apply one of the diff --git a/gnulib-local/modules/xalloc b/gnulib-local/modules/xalloc index dd8151511..deec4d451 100644 --- a/gnulib-local/modules/xalloc +++ b/gnulib-local/modules/xalloc @@ -9,6 +9,7 @@ lib/xstrdup.c Depends-on: error gettext-h +noreturn stdlib xalloc-oversized diff --git a/libtextstyle/.gitignore b/libtextstyle/.gitignore index bbf131286..36a5aebdb 100644 --- a/libtextstyle/.gitignore +++ b/libtextstyle/.gitignore @@ -124,6 +124,7 @@ /lib/msvc-nothrow.h /lib/noop-styled-ostream.oo.c /lib/noop-styled-ostream.oo.h +/lib/noreturn.h /lib/obstack.c /lib/obstack.h /lib/ostream.oo.c |