branch release/7.0 updated: * install-info/install-info.c (error): Declare as static to avoid clash with error function from glibc, called from gnulib. Report from Sam James <address@hidden> and suggested solution from Arsen Arsenović <address@hidden>.

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch release/7.0
in repository texinfo.

The following commit(s) were added to refs/heads/release/7.0 by this push:
     new 952b333db8 * install-info/install-info.c (error): Declare as static to 
avoid clash with error function from glibc, called from gnulib. Report from Sam 
James <sam@gentoo.org> and suggested solution from Arsen Arsenović 
<arsen@aarsen.me>.
952b333db8 is described below

commit 952b333db85f88fb51c7e051b15063d95cf7dfc8
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Dec 10 01:10:38 2022 +0000

    * install-info/install-info.c (error): Declare as static to
    avoid clash with error function from glibc, called from gnulib.
    Report from Sam James <sam@gentoo.org> and suggested solution
    from Arsen Arsenović <arsen@aarsen.me>.
---
 ChangeLog                   | 7 +++++++
 install-info/install-info.c | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 4746a23f7a..3a4ebd756d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-12-07  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       * install-info/install-info.c (error): Declare as static to
+       avoid clash with error function from glibc, called from gnulib.
+       Report from Sam James <sam@gentoo.org> and suggested solution
+       from Arsen Arsenović <arsen@aarsen.me>.
+
 2022-11-30  Gavin Smith  <gavinsmith0123@gmail.com>
 
        7.0.1 release
diff --git a/install-info/install-info.c b/install-info/install-info.c
index 8950288f6b..2ab91589b2 100644
--- a/install-info/install-info.c
+++ b/install-info/install-info.c
@@ -214,7 +214,9 @@ vdiag (const char *fmt, const char *diagtype, va_list ap)
   putc ('\n', stderr);
 }
 
-void
+/* declare as static to avoid clash with glibc error function, called from
+   gnulib. */
+static void
 error (const char *fmt, ...)
 {
   va_list ap;