--- a/Win32OperatingSystem.st	Mon May 03 21:04:49 1999 +0200
+++ b/Win32OperatingSystem.st	Mon May 03 21:05:13 1999 +0200
@@ -224,11 +224,6 @@
 #  endif
 # endif
 
-# if defined(HAS_UNAME)
-#  include <sys/utsname.h>
-# endif
-
-
 /*
  * sigaction dummies (you won't believe these call themself ``POSIX'' systems ...)
  */
@@ -4394,31 +4389,12 @@
 	name = __MKSTRING(buffer);
     }
 #else
-# if defined(HAS_UNAME)
-    struct utsname ubuff;
-
-    if (uname(&ubuff) >= 0) {
-	name = __MKSTRING(ubuff.nodename);
-    }
-# else
-#  if defined(HAS_SYSINFO) && defined(SI_HOSTNAME)
-    char buffer[256];
-    int ret;
- 
-    if ((ret = sysinfo(SI_HOSTNAME, buffer, sizeof(buffer))) >= 0 && ret <= sizeof(buffer)) {
-	name = __MKSTRING(buffer);
-    }
-#  else
-#   ifdef WIN32
     char buffer[128];
     int buffSize = sizeof(buffer);
 
     if (GetComputerName(buffer, &buffSize) == TRUE) {
 	name = __MKSTRING(buffer);
     }
-#   endif
-#  endif
-# endif
 #endif
 %}.
     name isNil ifTrue:[
@@ -5985,11 +5961,7 @@
       a subprocesses status (to avoid blocking)."
 
 %{ /*NOCONTEXT*/
-#if defined(HAS_WAITPID) || defined(HAS_WAIT3) || defined(WIN32) || defined(__VMS__)
     RETURN(false);
-#else
-    RETURN(true);
-#endif
 %}
 !
 
@@ -6687,6 +6659,6 @@
 !Win32OperatingSystem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.43 1999-04-30 09:32:49 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.44 1999-05-03 19:05:13 ps Exp $'
 ! !
 Win32OperatingSystem initialize!