commit c9d2b2638181862042c8d712cf7bf4977fea15e2
from: Stefan Sperling <stsp@stsp.name>
date: Wed Nov 11 11:09:51 2020 UTC

make gotweb compile with the new diff implementation

commit - 135a2da0c5bd18fcf65ac142fa604ec03ad1aa2d
commit + c9d2b2638181862042c8d712cf7bf4977fea15e2
blob - 86cf8bc92c4952d24ebe4dce99160c0be49ac598
blob + 48637640943824f4455df6330321f83f0ea237ad
--- gotweb/Makefile
+++ gotweb/Makefile
@@ -11,7 +11,10 @@ SRCS =		gotweb.c parse.y blame.c commit_graph.c delta.
 		object_idset.c object_parse.c opentemp.c path.c pack.c \
 		privsep.c reference.c repository.c sha1.c worktree.c \
 		inflate.c buf.c rcsutil.c diff3.c lockfile.c \
-		deflate.c object_create.c delta_cache.c gotconfig.c
+		deflate.c object_create.c delta_cache.c gotconfig.c \
+		diff_main.c diff_atomize_text.c diff_myers.c diff_output.c \
+		diff_output_plain.c diff_output_unidiff.c \
+		diff_output_edscript.c diff_patience.c
 MAN =		${PROG}.conf.5 ${PROG}.8
 
 CPPFLAGS +=	-I${.CURDIR}/../include -I${.CURDIR}/../lib -I${.CURDIR} \
blob - 1c534e627ac2c089c90c449e3637d2fcd63ff7e9
blob + 6bf26838d38755cb18338a68c2851c366cb88e56
--- gotweb/gotweb.c
+++ gotweb/gotweb.c
@@ -2869,15 +2869,15 @@ gw_output_diff(struct gw_trans *gw_trans, struct gw_he
 		goto done;
 	switch (obj_type) {
 	case GOT_OBJ_TYPE_BLOB:
-		error = got_diff_objects_as_blobs(id1, id2, NULL, NULL, 3, 0,
-		    gw_trans->repo, f);
+		error = got_diff_objects_as_blobs(NULL, NULL, id1, id2,
+		    NULL, NULL, 3, 0, gw_trans->repo, f);
 		break;
 	case GOT_OBJ_TYPE_TREE:
-		error = got_diff_objects_as_trees(id1, id2, "", "", 3, 0,
-		    gw_trans->repo, f);
+		error = got_diff_objects_as_trees(NULL, NULL, id1, id2,
+		   "", "", 3, 0, gw_trans->repo, f);
 		break;
 	case GOT_OBJ_TYPE_COMMIT:
-		error = got_diff_objects_as_commits(id1, id2, 3, 0,
+		error = got_diff_objects_as_commits(NULL, NULL, id1, id2, 3, 0,
 		    gw_trans->repo, f);
 		break;
 	default: