From: Bruno Haible <bruno@clisp.org>
Date: Sun, 20 Dec 2020 22:42:14 +0000 (+0100)
Subject: Update after gnulib changed.
X-Git-Tag: v0.22~282
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d425778290b2b72a320bb231eb9924bebfe27eda;p=thirdparty%2Fgettext.git

Update after gnulib changed.

* autogen.sh (GNULIB_MODULES_TOOLS_FOR_SRC, GNULIB_MODULES_LIBGETTEXTPO): Add
'free'.
* gnulib-local/lib/libxml/parser.in.h: Include <stdlib.h>.
* gettext-tools/src/format.h: Likewise.
* gettext-tools/tests/gettextpo-1-prg.c: Undefine free.
---

diff --git a/.gitignore b/.gitignore
index 74d346224..254a7ceff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,6 +110,7 @@
 /gettext-tools/libgettextpo/float.c
 /gettext-tools/libgettextpo/float.in.h
 /gettext-tools/libgettextpo/fopen.c
+/gettext-tools/libgettextpo/free.c
 /gettext-tools/libgettextpo/fstat.c
 /gettext-tools/libgettextpo/fstrcmp.c
 /gettext-tools/libgettextpo/fstrcmp.h
diff --git a/autogen.sh b/autogen.sh
index 30f5e41dd..02b4a3fb9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -147,6 +147,7 @@ if ! $skip_gnulib; then
     findprog
     fnmatch
     fopen
+    free-posix
     fstrcmp
     full-write
     fwriteerror
@@ -303,6 +304,7 @@ if ! $skip_gnulib; then
     error-progname
     filename
     fopen
+    free-posix
     fstrcmp
     fwriteerror
     gcd
diff --git a/gettext-tools/src/format.h b/gettext-tools/src/format.h
index af670ac15..4cd318654 100644
--- a/gettext-tools/src/format.h
+++ b/gettext-tools/src/format.h
@@ -19,6 +19,7 @@
 #define _FORMAT_H
 
 #include <stdbool.h>
+#include <stdlib.h>     /* because Gnulib's <stdlib.h> may '#define free ...' */
 
 #include "pos.h"        /* Get lex_pos_ty.  */
 #include "message.h"    /* Get NFORMATS.  */
diff --git a/gettext-tools/tests/gettextpo-1-prg.c b/gettext-tools/tests/gettextpo-1-prg.c
index 3c93c42e0..4c6c2bf13 100644
--- a/gettext-tools/tests/gettextpo-1-prg.c
+++ b/gettext-tools/tests/gettextpo-1-prg.c
@@ -1,5 +1,5 @@
 /* Test of public API for GNU gettext PO files.
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2020 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2010.
 
    This program is free software: you can redistribute it and/or modify
@@ -28,6 +28,7 @@
 /* Use the system functions, not the gnulib overrides in this file.  */
 #undef fflush
 #undef fprintf
+#undef free
 #undef printf
 #undef strdup
 
diff --git a/gnulib-local/lib/libxml/parser.in.h b/gnulib-local/lib/libxml/parser.in.h
index a4d6618d1..dab770482 100644
--- a/gnulib-local/lib/libxml/parser.in.h
+++ b/gnulib-local/lib/libxml/parser.in.h
@@ -1,5 +1,5 @@
 /* libxml2 - Library for parsing XML documents
- * Copyright (C) 2006-2019 Free Software Foundation, Inc.
+ * Copyright (C) 2006-2020 Free Software Foundation, Inc.
  *
  * This file is not part of the GNU gettext program, but is used with
  * GNU gettext.
@@ -40,6 +40,7 @@
 #define __XML_PARSER_H__
 
 #include <stdarg.h>
+#include <stdlib.h>     /* because Gnulib's <stdlib.h> may '#define free ...' */
 
 #include <libxml/xmlversion.h>
 #include <libxml/tree.h>