diff options
| author | Andreas Gruenbacher <andreas.gruenbacher@gmail.com> | 2014-11-26 17:02:34 +0100 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@linbit.com> | 2014-11-30 15:35:31 +0100 |
| commit | 3fd4144ae983cc8a7398ba6aa830f71e779bbdfd (patch) | |
| tree | 1455c4c012f8a1601f1849ad69244f75c44bd656 | |
| parent | 65193f1cc1bf38bdd63d1f3087b0d7e16ad3f082 (diff) | |
| download | patch-3fd4144ae983cc8a7398ba6aa830f71e779bbdfd.tar.gz | |
build: update gnulib submodule to latest
* src/merge.c (compute_changes): The TOO_EXPENSIVE heuristic in diffseq has
been removed, including compareseq's find_minimal parameter and the context's
too_expensive limit. Adjust.
| m--------- | gnulib | 0 | ||||
| -rw-r--r-- | m4/.gitignore | 5 | ||||
| -rw-r--r-- | src/merge.c | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/gnulib b/gnulib -Subproject 77b054428b11be9cd76d1e3b0a7cd7cf8605317 +Subproject 1b6c775c6b9c8054afcadc0aeb0ae39e81dc638 diff --git a/m4/.gitignore b/m4/.gitignore index 8868e4c..e582167 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -37,7 +37,6 @@ /gnulib-tool.m4 /hash.m4 /include_next.m4 -/inline.m4 /intmax_t.m4 /inttypes_h.m4 /largefile.m4 @@ -165,7 +164,6 @@ gnulib-comp.m4 gnulib-tool.m4 hash.m4 include_next.m4 -inline.m4 intmax_t.m4 inttypes_h.m4 lchmod.m4 @@ -244,7 +242,8 @@ xsize.m4 xstrndup.m4 xvasprintf.m4 /close.m4 -/gl_list.m4 /off_t.m4 /sys_types_h.m4 /extern-inline.m4 +/absolute-header.m4 +/secure_getenv.m4 diff --git a/src/merge.c b/src/merge.c index 4d7c11c..0db34d0 100644 --- a/src/merge.c +++ b/src/merge.c @@ -564,9 +564,8 @@ compute_changes (lin xmin, lin xmax, lin ymin, lin ymax, ctxt.bdiag += ymax + 1; ctxt.heuristic = true; - ctxt.too_expensive = xmax + ymax; - compareseq (xmin, xmax, ymin, ymax, true, &ctxt); + compareseq (xmin, xmax, ymin, ymax, &ctxt); ctxt.fdiag -= ymax + 1; free (ctxt.fdiag); |