From e6aa578643640d094cbc4c0985066266203c1535 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 27 Feb 2018 09:04:42 -0800 Subject: [PATCH] environ: fix link error on 32-bit Cygwin Problem reported for GNU Emacs by Ken Brown in: https://lists.gnu.org/r/emacs-devel/2018-02/msg00765.html * lib/unistd.in.h (environ) [__i386__]: Do not redeclare. --- ChangeLog | 7 +++++++ lib/unistd.in.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2f2f06ead7..667f916630 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2018-02-27 Paul Eggert + + environ: fix link error on 32-bit Cygwin + Problem reported for GNU Emacs by Ken Brown in: + https://lists.gnu.org/r/emacs-devel/2018-02/msg00765.html + * lib/unistd.in.h (environ) [__i386__]: Do not redeclare. + 2018-02-24 Bruno Haible mbrtowc tests: Fix regression on glibc. diff --git a/lib/unistd.in.h b/lib/unistd.in.h index 4ef0ffabb8..4f2e86e5ba 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -400,7 +400,7 @@ _GL_WARN_ON_USE (dup3, "dup3 is unportable - " #if @GNULIB_ENVIRON@ -# if defined __CYGWIN__ +# if defined __CYGWIN__ && !defined __i386__ /* The 'environ' variable is defined in a DLL. Therefore its declaration needs the '__declspec(dllimport)' attribute, but the system's lacks it. This leads to a link error on 64-bit Cygwin when the option -- 2.11.4.GIT