From 56977c02fd8c31ed4669245828f689512b21b0fc Mon Sep 17 00:00:00 2001
From: "\"Steven J. Hill\"" <sjhill@realitydiluted.com>
Date: Fri, 18 Aug 2006 02:34:31 +0000
Subject: Merge from trunk.

---
 libpthread/linuxthreads/ptfork.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'libpthread/linuxthreads/ptfork.c')

diff --git a/libpthread/linuxthreads/ptfork.c b/libpthread/linuxthreads/ptfork.c
index 9cdbb5436..853aeea92 100644
--- a/libpthread/linuxthreads/ptfork.c
+++ b/libpthread/linuxthreads/ptfork.c
@@ -78,16 +78,17 @@ pid_t __pthread_fork (struct fork_block *b)
   return pid;
 }
 
-#ifdef SHARED
+/* psm: have no idea why these are here, sjhill? */
+#if 0 /*def SHARED*/
 pid_t __fork (void)
 {
   return __libc_fork ();
 }
-weak_alias (__fork, fork);
+weak_alias (__fork, fork)
 
 pid_t __vfork(void)
 {
   return __libc_fork ();
 }
-weak_alias (__vfork, vfork);
+weak_alias (__vfork, vfork)
 #endif
-- 
cgit v1.2.3