--- a/UnixOperatingSystem.st	Tue Jan 25 12:01:31 2005 +0100
+++ b/UnixOperatingSystem.st	Tue Jan 25 12:25:54 2005 +0100
@@ -402,6 +402,9 @@
 # if defined(ultrix) || defined(sunos) || defined(NEXT)
 #  define HAS_NO_TIMEZONE
 # endif
+# if defined(OSX)
+#  define HAS_NO_TIMEZONE
+# endif
 
 /*
  * sigaction dummies (you won't believe these call themself ``POSIX'' systems ...)
@@ -10019,21 +10022,21 @@
 
 #if defined(F_GETFL) && defined(F_SETFL)
 # if defined(O_NDELAY)
-#  define DELAY O_NDELAY
+#  define DELAY_FLAG O_NDELAY
 # else
 #  if defined(FNDELAY)
-#   define DELAY FNDELAY
-#  endif
-# endif
-# if defined(DELAY)
+#   define DELAY_FLAG FNDELAY
+#  endif
+# endif
+# if defined(DELAY_FLAG)
     if (__isSmallInteger(__INST(fd))) {
 	int f = __intVal(__INST(fd));
 
 	flags = fcntl(f, F_GETFL, 0);
 	if (aBoolean == true) {
-	    ret = fcntl(f, F_SETFL, flags & ~DELAY);
+	    ret = fcntl(f, F_SETFL, flags & ~DELAY_FLAG);
 	} else {
-	    ret = fcntl(f, F_SETFL, flags | DELAY);
+	    ret = fcntl(f, F_SETFL, flags | DELAY_FLAG);
 	}
 	if (ret >= 0) {
 	    RETURN(__MKSMALLINT(flags));
@@ -10041,8 +10044,8 @@
 	    err = __MKSMALLINT(errno);
 	}
     }
-# undef DELAY
-# endif /* DELAY */
+# undef DELAY_FLAG
+# endif /* DELAY_FLAG */
 #endif
 %}.
     err notNil ifTrue:[
@@ -12270,7 +12273,7 @@
 !UnixOperatingSystem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.220 2005-01-03 15:44:56 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.221 2005-01-25 11:25:54 cg Exp $'
 ! !
 
 UnixOperatingSystem initialize!