--- a/UnixOperatingSystem.st	Wed Mar 31 15:52:36 2010 +0200
+++ b/UnixOperatingSystem.st	Thu Apr 01 11:14:38 2010 +0200
@@ -76,15 +76,6 @@
 
 #ifdef LINUX
 
-/* cg: 27-apr-05
- * disabled for now - there are so many systems
- * around, where this leads to problems when
- * the shared libraries are to be loaded.
- * Must be done dynamically, by probing the shared-lib
- * via dlopen / dlgetsym.
- */
-# define NO_CLOCK_GETTIME /* */
-
 # define __xxUSE_GNU      /* new */
 # undef HAS_UTS_DOMAINNAME
 # define NET_IF_SUPPORT
@@ -112,19 +103,7 @@
 # include <time.h>
 #endif
 
-#ifdef IRIX5
-# define WANT_SYSTEM
-#endif
-
-#ifdef ultrix
-# define WANT_SYSTEM
-#endif
-
-#ifdef hpux
-# define WANT_SYSTEM
-#endif
-
-#ifdef solaris
+#if defined(IRIX5) || defined(ultrix) || defined(hpux) || defined(solaris)
 # define WANT_SYSTEM
 #endif
 
@@ -203,34 +182,14 @@
 #   define _SYS_FILE_H_INCLUDED_
 #  endif
 
-#  if ! defined(sco3_2)
-#   ifndef _UNISTD_H_INCLUDED_
-#    include <unistd.h>
-#    define _UNISTD_H_INCLUDED_
-#   endif
-#  endif
-
-#  if defined(isc3_2) || defined(sco3_2)
-#   ifndef _SYS_TIME_H_INCLUDED_
-#    include <sys/time.h>
-#    define _SYS_TIME_H_INCLUDED_
-#   endif
-#  endif
-
-#  if !defined(isc3_2)
-#   if defined(PCS) && defined(__mips__)
-#    include "/usr/include/bsd/sys/time.h"
-#    include "/usr/include/sys/time.h"
-#   else
-#    ifndef _TIME_H_INCLUDED_
-#     include <time.h>
-#     define _TIME_H_INCLUDED_
-#    endif
-#   endif
-#  endif
-
-#  if defined(isc3_2)
-#   include <sys/bsdtypes.h>
+#  ifndef _UNISTD_H_INCLUDED_
+#   include <unistd.h>
+#   define _UNISTD_H_INCLUDED_
+#  endif
+
+#  ifndef _TIME_H_INCLUDED_
+#   include <time.h>
+#   define _TIME_H_INCLUDED_
 #  endif
 
 # else /* not SYSV */
@@ -275,9 +234,7 @@
 	long    tm_gmtoff;      /* offset from CUT in seconds */
 	char    *tm_zone;       /* timezone abbreviation */
 };
-
-
-# endif
+# endif /* __osx__ */
 
 # ifndef _STDIO_H_INCLUDED_
 #  include <stdio.h>
@@ -8649,7 +8606,7 @@
 #endif
 
 out:
-    RETURN ( __mkSmallInteger(t & _MAX_INT) );
+    RETURN ( __mkSmallInteger(t & 0x1FFFFFFF) );
 
 err:;
 %}.
@@ -12697,11 +12654,11 @@
 !UnixOperatingSystem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.265 2010-03-30 12:29:24 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.266 2010-04-01 09:14:38 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.265 2010-03-30 12:29:24 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.266 2010-04-01 09:14:38 stefan Exp $'
 ! !
 
 UnixOperatingSystem initialize!