summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2021-09-21 08:14:05 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2021-09-21 08:14:40 -0700
commit5d88f131091542816326a470e9dab945b763538d (patch)
tree277f2d3419f59180bd702b7bc3ad1901148fbff8
parent9aca7b67333fd0a90bf56104325ce96199644451 (diff)
downloadgnulib-5d88f131091542816326a470e9dab945b763538d.tar.gz
regex: sync with glibc
* config/srclist.txt: Uncomment-out posix/regex.c and related files, as the Gnulib versions have now been copied to glibc. * lib/intprops.h: Remove authorship comment, as per glibc guidelines.
-rw-r--r--ChangeLog7
-rw-r--r--config/srclist.txt16
-rw-r--r--lib/intprops.h1
3 files changed, 15 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d5ba08541..a641418208 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2021-09-21 Paul Eggert <eggert@cs.ucla.edu>
+
+ regex: sync with glibc
+ * config/srclist.txt: Uncomment-out posix/regex.c and related
+ files, as the Gnulib versions have now been copied to glibc.
+ * lib/intprops.h: Remove authorship comment, as per glibc guidelines.
+
2021-09-20 Simon Josefsson <simon@josefsson.org>
maint: Avoid syntax-check failure for empty gnulib submodule.
diff --git a/config/srclist.txt b/config/srclist.txt
index da906571ce..16b61721aa 100644
--- a/config/srclist.txt
+++ b/config/srclist.txt
@@ -63,13 +63,14 @@ $LIBCSRC malloc/scratch_buffer_dupfree.c lib/malloc
$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/regex.c lib
-#$LIBCSRC posix/regex.h lib
-#$LIBCSRC posix/regex_internal.c lib
-#$LIBCSRC posix/regex_internal.h lib
-#$LIBCSRC posix/regexec.c lib
+$LIBCSRC include/intprops.h lib
+$LIBCSRC misc/sys/cdefs.h lib
+$LIBCSRC posix/regcomp.c lib
+$LIBCSRC posix/regex.c lib
+$LIBCSRC posix/regex.h lib
+$LIBCSRC posix/regex_internal.c lib
+$LIBCSRC posix/regex_internal.h lib
+$LIBCSRC posix/regexec.c lib
#$LIBCSRC stdlib/canonicalize lib/canonicalize-lgpl.c
#$LIBCSRC sysdeps/generic/eloop-threshold.h lib
$LIBCSRC time/timegm.c lib
@@ -92,7 +93,6 @@ $LIBCSRC time/mktime-internal.h lib
#$LIBCSRC argp/argp-pvh.c lib gpl
#$LIBCSRC argp/argp-xinl.c lib gpl
#$LIBCSRC argp/argp.h lib gpl
-#$LIBCSRC misc/sys/cdefs.h lib
#$LIBCSRC stdlib/getsubopt.c lib gpl
#$LIBCSRC posix/getopt.c lib gpl
#$LIBCSRC posix/getopt.h lib gpl (getopt.in.h in gnulib)
diff --git a/lib/intprops.h b/lib/intprops.h
index 9d10028a59..3fe64e82e9 100644
--- a/lib/intprops.h
+++ b/lib/intprops.h
@@ -15,7 +15,6 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. */
-/* Written by Paul Eggert. */
#ifndef _GL_INTPROPS_H
#define _GL_INTPROPS_H