diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-02-01 09:20:13 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-02-01 09:21:39 -0800 |
| commit | 100e33979b139c007c45f0fd339a76e5a7ef494a (patch) | |
| tree | 79fb78ba700ac9ccecb4cf4e1133871a74fbf1c8 /lib/unistd.in.h | |
| parent | c85d9e401a686637284752a0eadc52f7a6b439d7 (diff) | |
| download | emacs-100e33979b139c007c45f0fd339a76e5a7ef494a.tar.gz | |
Update from gnulib
This includes:
2018-01-31 environ: Fix link error on 64-bit Cygwin
2018-01-27 Fix malfunction of socket functions on HP-UX in 64-bit mode
2018-01-26 manywarnings: fix maintainer comment
2018-01-23 Merge strftime.c changes from glibc
* build-aux/config.guess, build-aux/config.sub, doc/misc/texinfo.tex:
* lib/gnulib.mk.in, lib/nstrftime.c, lib/unistd.in.h, m4/extensions.m4:
* m4/manywarnings.m4: Update.
Diffstat (limited to 'lib/unistd.in.h')
| -rw-r--r-- | lib/unistd.in.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/unistd.in.h b/lib/unistd.in.h index ae59cb2e627..13f4bb6cd16 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -400,6 +400,13 @@ _GL_WARN_ON_USE (dup3, "dup3 is unportable - " #if @GNULIB_ENVIRON@ +# if defined __CYGWIN__ +/* 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 + -Wl,--disable-auto-import is in use. */ +_GL_EXTERN_C __declspec(dllimport) char **environ; +# endif # if !@HAVE_DECL_ENVIRON@ /* Set of environment variables and values. An array of strings of the form "VARIABLE=VALUE", terminated with a NULL. */ |