From: Bruno Haible <bruno@clisp.org>
Date: Sun, 4 Jun 2023 18:00:59 +0000 (+0200)
Subject: Update after gnulib changed.
X-Git-Tag: v0.22~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4070949af265ea7a87198637f259d4eca04d8eee;p=thirdparty%2Fgettext.git

Update after gnulib changed.

* gettext-tools/src/po-error.c (_GL_NO_INLINE_ERROR): New macro.
* gettext-tools/libgettextpo/gettext-po.c (_GL_NO_INLINE_ERROR): Likewise.
---

diff --git a/gettext-tools/libgettextpo/gettext-po.c b/gettext-tools/libgettextpo/gettext-po.c
index 7d3a1d06a..3588fdb4b 100644
--- a/gettext-tools/libgettextpo/gettext-po.c
+++ b/gettext-tools/libgettextpo/gettext-po.c
@@ -1,5 +1,5 @@
 /* Public API for GNU gettext PO files.
-   Copyright (C) 2003-2010, 2014 Free Software Foundation, Inc.
+   Copyright (C) 2003-2010, 2014, 2023 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software: you can redistribute it and/or modify
@@ -18,6 +18,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+/* Avoid side effect of gnulib's error.h on 'struct po_error_handler'.  */
+#define _GL_NO_INLINE_ERROR
 
 /* Specification.  */
 #include "gettext-po.h"
diff --git a/gettext-tools/src/po-error.c b/gettext-tools/src/po-error.c
index 8dd1e1390..9a6298425 100644
--- a/gettext-tools/src/po-error.c
+++ b/gettext-tools/src/po-error.c
@@ -1,5 +1,5 @@
 /* Error handling during reading and writing of PO files.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2023 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2004.
 
    This program is free software: you can redistribute it and/or modify
@@ -19,6 +19,8 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+/* Avoid side effect of gnulib's error.h.  */
+#define _GL_NO_INLINE_ERROR
 
 /* Specification.  */
 #include "po-error.h"