From efe019b5ec90dbd0689444ea668309e679841b44 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 17 Aug 2020 20:10:30 +0200 Subject: [PATCH] Revert autoupdate's revert. * config/srclist.txt: Mark regcomp.c as needing sync with glibc. --- ChangeLog | 5 +++++ config/srclist.txt | 2 +- lib/regcomp.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a053a2cca..c27eb07ebc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2020-08-17 Bruno Haible + Revert autoupdate's revert. + * config/srclist.txt: Mark regcomp.c as needing sync with glibc. + +2020-08-17 Bruno Haible + uchar C++ tests: Fix build error on FreeBSD 12. * modules/uchar-c++-tests (configure.ac): Test whether exists. (Makefile.am): Don't include test-uchar-c++2.cc in the compilation if diff --git a/config/srclist.txt b/config/srclist.txt index b82d2815ee..c1ac3e1a18 100644 --- a/config/srclist.txt +++ b/config/srclist.txt @@ -54,7 +54,7 @@ $LIBCSRC malloc/scratch_buffer_grow.c lib/malloc $LIBCSRC malloc/scratch_buffer_grow_preserve.c lib/malloc $LIBCSRC malloc/scratch_buffer_set_array_size.c lib/malloc #$LIBCSRC include/intprops.h lib -$LIBCSRC posix/regcomp.c lib +#$LIBCSRC posix/regcomp.c lib $LIBCSRC posix/regex.c lib #$LIBCSRC posix/regex.h lib $LIBCSRC posix/regex_internal.c lib diff --git a/lib/regcomp.c b/lib/regcomp.c index 93bb0a0538..692928b0db 100644 --- a/lib/regcomp.c +++ b/lib/regcomp.c @@ -558,7 +558,7 @@ weak_alias (__regerror, regerror) static const bitset_t utf8_sb_map = { /* Set the first 128 bits. */ -# if defined __GNUC__ && !defined __STRICT_ANSI__ +# if (defined __GNUC__ || __clang_major__ >= 4) && !defined __STRICT_ANSI__ [0 ... 0x80 / BITSET_WORD_BITS - 1] = BITSET_WORD_MAX # else # if 4 * BITSET_WORD_BITS < ASCII_CHARS -- 2.11.4.GIT