]> Savannah Git Hosting - gnulib.git/commitdiff
Revert autoupdate's revert.
authorBruno Haible <bruno@clisp.org>
Mon, 17 Aug 2020 18:10:30 +0000 (20:10 +0200)
committerBruno Haible <bruno@clisp.org>
Mon, 17 Aug 2020 18:10:56 +0000 (20:10 +0200)
* config/srclist.txt: Mark regcomp.c as needing sync with glibc.

ChangeLog
config/srclist.txt
lib/regcomp.c

index 6a053a2cca64f2d4cc474ef400b16fb6253dc8a0..c27eb07ebcafaea96bb4b321ecf97718db4c99e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2020-08-17  Bruno Haible  <bruno@clisp.org>
+
+       Revert autoupdate's revert.
+       * config/srclist.txt: Mark regcomp.c as needing sync with glibc.
+
 2020-08-17  Bruno Haible  <bruno@clisp.org>
 
        uchar C++ tests: Fix build error on FreeBSD 12.
index b82d2815eed752c767765510c8c5c7e50fa2b4a1..c1ac3e1a181e03f4ac107fee7f9d1f4b2d5bb3c0 100644 (file)
@@ -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
index 93bb0a0538a1f010b263bc8bca108ad3e54afee0..692928b0dbf1e034535c1be2872f9a00eeffba14 100644 (file)
@@ -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