--- a/UnixOperatingSystem.st	Fri Apr 10 08:38:29 2015 +0100
+++ b/UnixOperatingSystem.st	Sat Apr 11 07:03:33 2015 +0100
@@ -2203,13 +2203,12 @@
                 break;
 #endif
 #ifdef ENOTSUP
-/* See https://sourceware.org/bugzilla/show_bug.cgi?id=2363 */
-# if ENOTSUP != EOPNOTSUPP
+# if !defined(EOPNOTSUPP) || (ENOTSUP != EOPNOTSUPP)
             case ENOTSUP:
                 sym = @symbol(ENOTSUP);        
                 typ = @symbol(inappropriateOperationSignal);
                 break;
-#endif
+# endif
 #endif
 #ifdef ESPIPE
             case ESPIPE:
@@ -2638,8 +2637,7 @@
 #endif
 
 #ifdef ENOTSUP
-/* See https://sourceware.org/bugzilla/show_bug.cgi?id=2363 */
-# if ENOTSUP != EOPNOTSUPP
+# if !defined(EOPNOTSUPP) || (ENOTSUP != EOPNOTSUPP)
     if (sym == @symbol(ENOTSUP)) {
         RETURN ( __mkSmallInteger(ENOTSUP) );
     }
@@ -14204,11 +14202,11 @@
 !UnixOperatingSystem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.433 2015-04-09 13:26:12 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.434 2015-04-10 11:34:36 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.433 2015-04-09 13:26:12 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.434 2015-04-10 11:34:36 cg Exp $'
 ! !