Merge from emacs-24; up to 2012-12-31T11:35:13Z!rudalics@gmx.at

[gnu-emacs] / lib / unistd.in.h

diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index 675c7e6a552a5641ec2fe23cf6bd3f48386dd417..2ea9af436527f057953750fdcf2bc536461d2a9f 100644 (file)
--- 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