--- a/SemaphoreSet.st	Tue Feb 04 21:09:59 2014 +0100
+++ b/SemaphoreSet.st	Wed Apr 01 10:20:10 2015 +0100
@@ -193,7 +193,9 @@
                 wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
             ].
         ].
-    ] doWhile:[gotSema isNil].
+
+        gotSema isNil
+    ] whileTrue.
 
     "
       we finally got at least one of our semaphores.
@@ -283,7 +285,9 @@
                 wasBlocked ifFalse:[OperatingSystem unblockInterrupts].
             ].
         ].
-    ] doUntil:[gotSema notNil or:[timeoutOccured]].
+
+        gotSema isNil and:[timeoutOccured not]
+    ] whileTrue.
 
     timeoutBlock notNil ifTrue:[
         Processor removeTimedBlock:timeoutBlock.
@@ -310,10 +314,10 @@
 !SemaphoreSet class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/SemaphoreSet.st,v 1.20 2013-02-08 16:08:28 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/SemaphoreSet.st,v 1.21 2014-03-28 13:39:55 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/SemaphoreSet.st,v 1.20 2013-02-08 16:08:28 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/SemaphoreSet.st,v 1.21 2014-03-28 13:39:55 stefan Exp $'
 ! !