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 1c6f64f2780063f365310969e5c4b7dc6eb17cde..2d14bee211f8452606d6b29ba9073aaf6b672ed0 100644 (file)
--- 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 3868c7a485a55a370c86d50fddd86b5da903f89e..e7297697938137543237c9210d20a445bccac4a5 100644 (file)
--- 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);