diff options
| author | Bruno Haible <bruno@clisp.org> | 2020-07-28 19:52:13 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2022-10-09 09:30:42 +0200 |
| commit | 45c8d0aec9023ddf4c0ab9f12d67fc2f7e66df2c (patch) | |
| tree | feb25c81c7f54775b99f38ba20297776d01a4201 | |
| parent | 4eedf8a84824a1ad5eb5acdac9a7241d7a0525b2 (diff) | |
| download | gettext-45c8d0aec9023ddf4c0ab9f12d67fc2f7e66df2c.tar.gz | |
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.
| -rw-r--r-- | gnulib-local/lib/getopt-core.h.diff | 6 |
1 files changed, 3 insertions, 3 deletions
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 + |