diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2018-03-07 05:54:53 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2018-03-07 05:54:53 +0100 |
| commit | 76ef1d8e3249e82a6965fd17157bee00a7857ff3 (patch) | |
| tree | 7d3d34b059039faf525d1e95bbdc1945a9fa103c /lib/unistd.in.h | |
| parent | 0cb66c451a1a4e717878b8296b79c8d7cfd38b30 (diff) | |
| parent | 93e8e16be294d19261c7378dd2e46d3f35f06926 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'lib/unistd.in.h')
| -rw-r--r-- | lib/unistd.in.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/unistd.in.h b/lib/unistd.in.h index 25e41d6..c25ff8e 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -1,5 +1,5 @@ /* Substitute for and wrapper around <unistd.h>. - Copyright (C) 2003-2017 Free Software Foundation, Inc. + Copyright (C) 2003-2018 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of either: @@ -409,6 +409,13 @@ _GL_WARN_ON_USE (dup3, "dup3 is unportable - " #if @GNULIB_ENVIRON@ +# 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 + -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. */ |