[asperl] integrate mainline changes

p4raw-id: //depot/asperl@607

1 files changed, 7 insertions, 3 deletions

diff --git a/pp.c b/pp.c
index c78c845ce1..aaa058b5bb 100644
--- a/pp.c
+++ b/pp.c
@@ -107,12 +107,16 @@ static bool srand_called = FALSE;
 
 /* variations on pp_null */
 
-#ifdef DONT_DECLARE_STD
 #ifdef I_UNISTD
 #include <unistd.h>
 #endif
-#else
-extern pid_t getpid (void);
+
+/* XXX I can't imagine anyone who doesn't have this actually _needs_
+   it, since pid_t is an integral type.
+   --AD  2/20/1998
+*/
+#ifdef NEED_GETPID_PROTO
+extern Pid_t getpid (void);
 #endif
 
 PP(pp_stub)