diff options
author | Andreas Gruenbacher <agruen@gnu.org> | 2017-09-04 13:44:17 +0200 |
---|---|---|
committer | Andreas Gruenbacher <agruen@gnu.org> | 2017-09-04 13:56:25 +0200 |
commit | a2b6fb1672f59abccde3f94e1bf85ea30535d282 (patch) | |
tree | c275d4f25b445a38d9289eb409b8787e22932e43 | |
parent | 817d7d17674b6e85281ed78c82c204d618f028df (diff) | |
download | patch-a2b6fb1672f59abccde3f94e1bf85ea30535d282.tar.gz |
gnulib: update to latest
-rw-r--r-- | bootstrap.conf | 1 | ||||
m--------- | gnulib | 0 | ||||
-rw-r--r-- | m4/.gitignore | 16 | ||||
-rw-r--r-- | src/merge.c | 2 |
4 files changed, 16 insertions, 3 deletions
diff --git a/bootstrap.conf b/bootstrap.conf index 2b727d7..e83fddc 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -49,6 +49,7 @@ manywarnings memchr minmax mkdirat +nstrftime openat progname quotearg diff --git a/gnulib b/gnulib -Subproject 348402f2aac342bc925b7aaea9ee3cc353f427a +Subproject 064df0b0c4e2ba21565ae33211ed371de0cea37 diff --git a/m4/.gitignore b/m4/.gitignore index 2b37d23..9a94c0e 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -225,7 +225,6 @@ xvasprintf.m4 /sys_types_h.m4 /extern-inline.m4 /absolute-header.m4 -/secure_getenv.m4 /canonicalize.m4 /chdir-long.m4 /chown.m4 @@ -254,7 +253,6 @@ xvasprintf.m4 /symlinkat.m4 /unlink.m4 /unlinkat.m4 -/utimbuf.m4 /utimens.m4 /utimensat.m4 /utimes.m4 @@ -263,3 +261,17 @@ xvasprintf.m4 /getgroups.m4 /group-member.m4 /hard-locale.m4 +/flexmember.m4 +/getprogname.m4 +/inttypes-pri.m4 +/inttypes.m4 +/limits-h.m4 +/localtime-buffer.m4 +/manywarnings-c++.m4 +/open-cloexec.m4 +/time_rz.m4 +/timegm.m4 +/tzset.m4 +/utime.m4 +/utime_h.m4 +/nstrftime.m4 diff --git a/src/merge.c b/src/merge.c index 9f761d4..6f6205a 100644 --- a/src/merge.c +++ b/src/merge.c @@ -565,7 +565,7 @@ compute_changes (lin xmin, lin xmax, lin ymin, lin ymax, ctxt.heuristic = true; - compareseq (xmin, xmax, ymin, ymax, &ctxt); + compareseq (xmin, xmax, ymin, ymax, false, &ctxt); ctxt.fdiag -= ymax + 1; free (ctxt.fdiag); |