Mercurial > gnulib
changeset 39262:607608a9502c
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.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Tue, 27 Feb 2018 09:04:42 -0800 |
| parents | c18e05f31581 |
| children | 47ec79429399 |
| files | ChangeLog lib/unistd.in.h |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Feb 26 08:32:38 2018 -0800 +++ b/ChangeLog Tue Feb 27 09:04:42 2018 -0800 @@ -1,3 +1,10 @@ +2018-02-27 Paul Eggert <eggert@cs.ucla.edu> + + 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 <bruno@clisp.org> mbrtowc tests: Fix regression on glibc.
--- a/lib/unistd.in.h Mon Feb 26 08:32:38 2018 -0800 +++ b/lib/unistd.in.h Tue Feb 27 09:04:42 2018 -0800 @@ -400,7 +400,7 @@ #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 <unistd.h> lacks it. This leads to a link error on 64-bit Cygwin when the option