--- a/UnixOperatingSystem.st	Fri Oct 08 11:43:14 1999 +0200
+++ b/UnixOperatingSystem.st	Fri Oct 08 14:46:02 1999 +0200
@@ -44,7 +44,13 @@
 #endif
 
 #ifdef LINUX
-# define __USE_GNU      /* new */
+# define __xxUSE_GNU      /* new */
+# undef HAS_UTS_DOMAINNAME
+
+# ifndef _STDIO_H_INCLUDED_
+#  include <stdio.h>
+#  define _STDIO_H_INCLUDED_
+# endif
 
 # ifndef _SYS_TYPES_H_INCLUDED_
 #  include <sys/types.h>
@@ -217,6 +223,11 @@
 
 # endif /* aix */
 
+# ifndef _STDIO_H_INCLUDED_
+#  include <stdio.h>
+#  define _STDIO_H_INCLUDED_
+# endif
+
 # ifndef _PWD_H_INCLUDED_
 #  include <pwd.h>
 #  define _PWD_H_INCLUDED_
@@ -245,11 +256,6 @@
 #  define _ERRNO_H_INCLUDED_
 # endif
 
-# ifndef _STDIO_H_INCLUDED_
-#  include <stdio.h>
-#  define _STDIO_H_INCLUDED_
-# endif
-
 # ifndef _FCNTL_H_INCLUDED_
 #  include <fcntl.h>
 #  define _FCNTL_H_INCLUDED_
@@ -513,7 +519,7 @@
 
 # if (!defined(HAVE_GNU_LD) && !defined (__ELF__)) || !defined(LINUX)
 #  define       __environ       environ
-#  if !defined(LINUX)
+#  if 1 /* !defined(LINUX) */
 #   define      __sigemptyset   sigemptyset
 #   define      __sigaction     sigaction
 #   define      __sigaddset     sigaddset
@@ -530,6 +536,9 @@
    extern char **environ;
 # endif
 
+# define      __sigprocmask   sigprocmask
+# define      __execve        execve
+
 # define        SHELL_PATH      "/bin/sh"       /* Path of the shell.  */
 # define        SHELL_NAME      "sh"            /* Name to give it.  */
 
@@ -8704,6 +8713,6 @@
 !UnixOperatingSystem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.70 1999-10-06 12:59:44 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.71 1999-10-08 12:46:02 cg Exp $'
 ! !
 UnixOperatingSystem initialize!