From: Bruno Haible <bruno@clisp.org>
Date: Tue, 28 Jul 2020 17:52:13 +0000 (+0200)
Subject: Fix build error on Solaris 11 in 32-bit mode.
X-Git-Tag: v0.21.1~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45c8d0aec9023ddf4c0ab9f12d67fc2f7e66df2c;p=thirdparty%2Fgettext.git

Fix build error on Solaris 11 in 32-bit mode.

This fixes a compilation error on Solaris 11.3 (both x86_64 and SPARC,
both with gcc and cc) in 32-bit mode.

Reported by Kiyoshi KANAZAWA <yoi_no_myoujou@yahoo.co.jp> in
<https://lists.gnu.org/archive/html/bug-gettext/2020-07/msg00034.html>.

* gnulib-local/lib/getopt-core.h.diff: Don't include <config.h> if it has
already been included. This fixes the compilation of vma-iter.c.
---

diff --git a/gnulib-local/lib/getopt-core.h.diff b/gnulib-local/lib/getopt-core.h.diff
index 52d31fa97..5e385cf7d 100644
--- a/gnulib-local/lib/getopt-core.h.diff
+++ b/gnulib-local/lib/getopt-core.h.diff
@@ -1,5 +1,5 @@
---- getopt-core.h	2017-05-15 19:05:30.377063268 +0200
-+++ getopt-core.h.new	2017-05-15 19:10:17.203267905 +0200
+--- getopt-core.h.bak	2020-06-26 21:24:59.890340657 +0200
++++ getopt-core.h	2020-07-28 19:48:27.769014629 +0200
 @@ -20,6 +20,14 @@
  #ifndef _GETOPT_CORE_H
  #define _GETOPT_CORE_H 1
@@ -8,7 +8,7 @@
 +   <stdlib.h> includes <getopt.h>, and <config.h> is not a prerequisite for
 +   using <stdlib.h>, this file can be included without a prior
 +   "#include <config.h>".  */
-+#ifdef HAVE_CONFIG_H
++#if !defined DLL_VARIABLE && defined HAVE_CONFIG_H
 +# include <config.h>
 +#endif
 +