diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2023-04-14 13:27:37 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2023-04-14 13:27:37 +0300 |
| commit | 75d8ed16ad265469b1631ea828143519703a0c09 (patch) | |
| tree | e117daf152b95e8356ed968b56bd726307124e61 /support | |
| parent | 818e413643676b2fd2ab2bf272af6be5bb79e5b2 (diff) | |
| parent | b735d1ef4696b6920a7c7bc3e4b9a2fe6ccadd51 (diff) | |
| download | gawk-75d8ed16ad265469b1631ea828143519703a0c09.tar.gz | |
Merge branch 'gawk-5.2-stable'
Diffstat (limited to 'support')
| -rw-r--r-- | support/ChangeLog | 5 | ||||
| -rw-r--r-- | support/Makefile.am | 2 | ||||
| -rw-r--r-- | support/Makefile.in | 2 | ||||
| -rw-r--r-- | support/dfa.h | 8 | ||||
| -rw-r--r-- | support/flexmember.h | 7 | ||||
| -rw-r--r-- | support/regex_internal.h | 2 |
6 files changed, 23 insertions, 3 deletions
diff --git a/support/ChangeLog b/support/ChangeLog index 7be12deb..c2c3c338 100644 --- a/support/ChangeLog +++ b/support/ChangeLog @@ -1,3 +1,8 @@ +2023-04-14 Arnold D. Robbins <arnold@skeeve.com> + + * Makefile.am: Update copyright year. + * dfa.h, flexmember.h, regex_internal.h: Upate from GNULIB. + 2023-03-26 Arnold D. Robbins <arnold@skeeve.com> * dfa.c, verify.h: Sync from GNULIB. diff --git a/support/Makefile.am b/support/Makefile.am index 2f172b6a..016931ae 100644 --- a/support/Makefile.am +++ b/support/Makefile.am @@ -1,7 +1,7 @@ # # Makefile.am --- automake input file for gawk # -# Copyright (C) 2000-2016, 2018, 2019, 2021, 2022 +# Copyright (C) 2000-2016, 2018, 2019, 2021, 2022, 2023 # the Free Software Foundation, Inc. # # This file is part of GAWK, the GNU implementation of the diff --git a/support/Makefile.in b/support/Makefile.in index 0c20902b..3b200b86 100644 --- a/support/Makefile.in +++ b/support/Makefile.in @@ -17,7 +17,7 @@ # # Makefile.am --- automake input file for gawk # -# Copyright (C) 2000-2016, 2018, 2019, 2021, 2022 +# Copyright (C) 2000-2016, 2018, 2019, 2021, 2022, 2023 # the Free Software Foundation, Inc. # # This file is part of GAWK, the GNU implementation of the diff --git a/support/dfa.h b/support/dfa.h index 6ac30ffa..69a3bac6 100644 --- a/support/dfa.h +++ b/support/dfa.h @@ -21,6 +21,14 @@ #ifndef DFA_H_ #define DFA_H_ +#ifndef GAWK +/* This file uses _Noreturn, _GL_ATTRIBUTE_DEALLOC, _GL_ATTRIBUTE_MALLOC, + _GL_ATTRIBUTE_PURE, _GL_ATTRIBUTE_RETURNS_NONNULL. */ +#if !_GL_CONFIG_H_INCLUDED + #error "Please include config.h first." +#endif +#endif /* GAWK */ + #include "idx.h" #include <regex.h> #include <stddef.h> diff --git a/support/flexmember.h b/support/flexmember.h index a6cc876a..4e5d3c9a 100644 --- a/support/flexmember.h +++ b/support/flexmember.h @@ -20,6 +20,13 @@ Written by Paul Eggert. */ +#ifndef GAWK +/* This file uses _Alignof. */ +#if !_GL_CONFIG_H_INCLUDED + #error "Please include config.h first." +#endif +#endif /* GAWK */ + #include <stddef.h> /* Nonzero multiple of alignment of TYPE, suitable for FLEXSIZEOF below. diff --git a/support/regex_internal.h b/support/regex_internal.h index 149ec2e8..ae9257ea 100644 --- a/support/regex_internal.h +++ b/support/regex_internal.h @@ -822,7 +822,7 @@ re_string_elem_size_at (const re_string_t *pstr, Idx idx) } #ifdef _LIBC -# if __GNUC__ >= 7 +# if __glibc_has_attribute (__fallthrough__) # define FALLTHROUGH __attribute__ ((__fallthrough__)) # else # define FALLTHROUGH ((void) 0) |