From fb44529bfa05b9c05cc2edd49566db1b3a37ca54 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Fri, 1 Dec 2017 13:56:50 +0200 Subject: Small updates in support routines. --- support/ChangeLog | 6 ++++++ support/intprops.h | 8 ++++---- support/regcomp.c | 2 +- support/regex.h | 4 ---- 4 files changed, 11 insertions(+), 9 deletions(-) (limited to 'support') diff --git a/support/ChangeLog b/support/ChangeLog index f7b450c2..a4520ece 100644 --- a/support/ChangeLog +++ b/support/ChangeLog @@ -1,3 +1,9 @@ +2017-12-01 Arnold D. Robbins + + * intprops.h: Sync with GNULIB. + * regcomp.c (init_word): Move general_case label inside ifdef. + * regex.h: Don't define __USE_GNU. Brings closer to GLIBC regex. + 2017-11-26 Arnold D. Robbins * regcomp.c regex_internal.c, regex_internal.h, regexec.c: Sync diff --git a/support/intprops.h b/support/intprops.h index 33a7ec5a..fd6d9268 100644 --- a/support/intprops.h +++ b/support/intprops.h @@ -13,7 +13,7 @@ GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . */ + along with this program. If not, see . */ /* Written by Paul Eggert. */ @@ -26,7 +26,7 @@ #define _GL_INT_CONVERT(e, v) (0 * (e) + (v)) /* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see - . */ + . */ #define _GL_INT_NEGATE_CONVERT(e, v) (0 * (e) - (v)) /* The extra casts in the following macros work around compiler bugs, @@ -179,7 +179,7 @@ /* Return 1 if A * B would overflow in [MIN,MAX] arithmetic. See above for restrictions. Avoid && and || as they tickle bugs in Sun C 5.11 2010/08/13 and other compilers; see - . */ + . */ #define INT_MULTIPLY_RANGE_OVERFLOW(a, b, min, max) \ ((b) < 0 \ ? ((a) < 0 \ @@ -443,7 +443,7 @@ implementation-defined result or signal for values outside T's range. However, code that works around this theoretical problem runs afoul of a compiler bug in Oracle Studio 12.3 x86. See: - http://lists.gnu.org/archive/html/bug-gnulib/2017-04/msg00049.html + https://lists.gnu.org/r/bug-gnulib/2017-04/msg00049.html As the compiler bug is real, don't try to work around the theoretical problem. */ diff --git a/support/regcomp.c b/support/regcomp.c index 2b662edb..4fca1108 100644 --- a/support/regcomp.c +++ b/support/regcomp.c @@ -999,9 +999,9 @@ init_word_char (re_dfa_t *dfa) return; } } -#endif general_case: +#endif for (; i < BITSET_WORDS; ++i) for (int j = 0; j < BITSET_WORD_BITS; ++j, ++ch) if (isalnum (ch) || ch == '_') diff --git a/support/regex.h b/support/regex.h index adddd9ee..1bbbb26c 100644 --- a/support/regex.h +++ b/support/regex.h @@ -28,10 +28,6 @@ #include #endif -#ifndef _LIBC -#define __USE_GNU 1 -#endif - /* Allow the use in C++ code. */ #ifdef __cplusplus extern "C" { -- cgit v1.2.3 From 62495dfc7853ccf2a35569000223941a5fe552ba Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Fri, 1 Dec 2017 14:00:50 +0200 Subject: Remove includes of gawkbool.h from support files. Ooops. --- support/ChangeLog | 2 ++ support/dfa.h | 4 ---- support/regex.c | 3 --- 3 files changed, 2 insertions(+), 7 deletions(-) (limited to 'support') diff --git a/support/ChangeLog b/support/ChangeLog index a4520ece..85d1b7b9 100644 --- a/support/ChangeLog +++ b/support/ChangeLog @@ -3,6 +3,8 @@ * intprops.h: Sync with GNULIB. * regcomp.c (init_word): Move general_case label inside ifdef. * regex.h: Don't define __USE_GNU. Brings closer to GLIBC regex. + * regex.c: Don't include gawkbool.h, we don't use it anymore. + * dfa.h: Ditto. 2017-11-26 Arnold D. Robbins diff --git a/support/dfa.h b/support/dfa.h index 7d11f05d..79ada1e2 100644 --- a/support/dfa.h +++ b/support/dfa.h @@ -19,11 +19,7 @@ /* Written June, 1988 by Mike Haertel */ #include -#ifdef HAVE_STDBOOL_H #include -#else -#include "missing_d/gawkbool.h" -#endif /* HAVE_STDBOOL_H */ #include #if 3 <= __GNUC__ diff --git a/support/regex.c b/support/regex.c index d3a44851..dc8caf69 100644 --- a/support/regex.c +++ b/support/regex.c @@ -69,9 +69,6 @@ #include "regex_internal.h" #include "regex_internal.c" -#ifndef HAVE_STDBOOL_H -#include "missing_d/gawkbool.h" -#endif #include "regcomp.c" #include "regexec.c" -- cgit v1.2.3