From: Matthew Vernon <matthew@debian.org>
Date: Tue, 12 Oct 2021 08:01:41 +0000 (+0100)
Subject: Correct function signature of shortuniv_assign (Closes: #983989)
X-Git-Tag: archive/debian/4.37~1
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~matthewv/git?a=commitdiff_plain;h=8ab1986fe45794635e2c84af6cb1e37a37ae9a87;p=bible-kjv.git

Correct function signature of shortuniv_assign (Closes: #983989)

This fixes a FTBFS with gcc-11; the first argument of shortuniv_assign
is meant to be Short_Univ_int (and, indeed, that's the type that was
being used where it is called), but it was wrongly declared as
Univ_int.
---

diff --git a/util.c b/util.c
index 1c6f64f..2d14bee 100644
--- a/util.c
+++ b/util.c
@@ -128,7 +128,7 @@ void univ_assign(Univ_Int dst,int src)
 } /* univ_assign */
 
 
-void shortuniv_assign(Univ_Int dst,int src)
+void shortuniv_assign(Short_Univ_Int dst,int src)
 /*----------------------------------------------------------------------
 |   NAME:
 |       shortuniv_assign
diff --git a/util.h b/util.h
index 3868c7a..e729769 100644
--- a/util.h
+++ b/util.h
@@ -63,7 +63,7 @@ typedef unsigned char Short_Univ_Int[2]; /* shorter Univ_Int */
 int univ2int(Univ_Int src);
 int shortuniv2int(Short_Univ_Int src);
 void univ_assign(Univ_Int dst,int src);
-void shortuniv_assign(Univ_Int dst,int src);
+void shortuniv_assign(Short_Univ_Int dst,int src);
 
 FILE *findfile(char *dfname,char *pathlist);