From 932b2c718ad00478a69c277ed4dc87469b32ba54 Mon Sep 17 00:00:00 2001
From: "Gary V. Vaughan" <gary@gnu.org>
Date: Mon, 11 Mar 2013 12:48:58 +0700
Subject: [PATCH] unistd: don't prevent Tru64 Unix from using gnulib strtod.

* lib/unistd.in.h: be careful not to include un-needed system
stdlib.h from here, because that prevents gnulib stdlib.h from
defining rpl_strtod correctly.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
---
 ChangeLog       | 7 +++++++
 lib/unistd.in.h | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 805b15306..4b936eaaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-11  Gary V. Vaughan  <gary@gnu.org>
+
+	unistd: don't prevent Tru64 Unix from using gnulib strtod.
+	* lib/unistd.in.h: be careful not to include un-needed system
+	stdlib.h from here, because that prevents gnulib stdlib.h from
+	defining rpl_strtod correctly.
+
 2013-03-09  Gary V. Vaughan  <gary@gnu.org>
 
 	vasprintf-posix-tests: allow rounding 1.51 to 1, per the previous
diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index 8a25aa434..31e20bcb1 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
-- 
2.11.0