diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-11-14 12:23:11 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-11-14 12:25:11 -0800 |
| commit | dc7a3ba28b49fe67e469931bc9e66ea1b71fc4d3 (patch) | |
| tree | f0f87b955dd0e08a134b0805aeb468e348695b8e /lib/unistd.in.h | |
| parent | 5caf6c9358068f9fca8ebde3230a2df1155c0d0c (diff) | |
| download | emacs-dc7a3ba28b49fe67e469931bc9e66ea1b71fc4d3.tar.gz emacs-dc7a3ba28b49fe67e469931bc9e66ea1b71fc4d3.tar.bz2 emacs-dc7a3ba28b49fe67e469931bc9e66ea1b71fc4d3.zip | |
Merge from gnulib.
2014-11-14 extern-inline: update commentary about GCC bugs
2014-11-06 unistd: port to iOS
2014-11-04 update from texinfo
* doc/misc/texinfo.tex, lib/unistd.in.h, m4/extern-inline.m4:
Update from gnulib.
Diffstat (limited to 'lib/unistd.in.h')
| -rw-r--r-- | lib/unistd.in.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/unistd.in.h b/lib/unistd.in.h index bbbfd75bdd6..219f43d9310 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -401,6 +401,12 @@ _GL_WARN_ON_USE (dup3, "dup3 is unportable - " /* Set of environment variables and values. An array of strings of the form "VARIABLE=VALUE", terminated with a NULL. */ # if defined __APPLE__ && defined __MACH__ +# include <TargetConditionals.h> +# if !defined TARGET_OS_IPHONE && !defined TARGET_IPHONE_SIMULATOR +# define _GL_USE_CRT_EXTERNS +# endif +# endif +# ifdef _GL_USE_CRT_EXTERNS # include <crt_externs.h> # define environ (*_NSGetEnviron ()) # else |