diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-03-12 17:38:42 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-03-12 17:38:42 -0700 |
| commit | 5615c9a9af487c19ab0bd30cb15d7bdb9af53560 (patch) | |
| tree | da5460962adeb04d0b5589f388a52a129095a41b /lib/unistd.in.h | |
| parent | 84c3ab6860d2247e0da13d418545807a5f2f90fc (diff) | |
Merge from gnulib.
This incorporates:
2013-03-12 mktime: fix configure typo
2013-03-11 regex: port to mingw's recent addition of undeclared alarm
2013-03-11 putenv: avoid compilation warning on mingw
2013-03-11 unistd: don't prevent Tru64 Unix from using gnulib strtod.
Diffstat (limited to 'lib/unistd.in.h')
| -rw-r--r-- | lib/unistd.in.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/unistd.in.h b/lib/unistd.in.h index 675c7e6a55..2ea9af4365 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -61,8 +61,10 @@ /* mingw, MSVC, BeOS, Haiku declare environ in <stdlib.h>, not in <unistd.h>. */ /* Solaris declares getcwd not only in <unistd.h> but also in <stdlib.h>. */ +/* OSF Tru64 Unix cannot see gnulib rpl_strtod when system <stdlib.h> is + included here. */ /* But avoid namespace pollution on glibc systems. */ -#ifndef __GLIBC__ +#if !defined __GLIBC__ && !defined __osf__ # define __need_system_stdlib_h # include <stdlib.h> # undef __need_system_stdlib_h |