@@ -41,11 +41,11 @@
 #import "OFTimer+Private.h"
 #import "OFDate.h"
 
 #import "OFObserveFailedException.h"
 
-const of_run_loop_mode_t of_run_loop_mode_default = @"of_run_loop_mode_default";
+const OFRunLoopMode OFDefaultRunLoopMode = @"OFDefaultRunLoopMode";
 static OFRunLoop *mainRunLoop = nil;
 
 @interface OFRunLoopState: OFObject
 #ifdef OF_HAVE_SOCKETS
     <OFKernelEventObserverDelegate>
@@ -1014,11 +1014,11 @@
 {
 	mainRunLoop = [runLoop retain];
 }
 
 static OFRunLoopState *
-stateForMode(OFRunLoop *self, of_run_loop_mode_t mode, bool create)
+stateForMode(OFRunLoop *self, OFRunLoopMode mode, bool create)
 {
 	OFRunLoopState *state;
 
 #ifdef OF_HAVE_THREADS
 	[self->_statesMutex lock];
@@ -1085,11 +1085,11 @@
 
 + (void)of_addAsyncReadForStream: (OFStream <OFReadyForReadingObserving> *)
 				      stream
 			  buffer: (void *)buffer
 			  length: (size_t)length
-			    mode: (of_run_loop_mode_t)mode
+			    mode: (OFRunLoopMode)mode
 # ifdef OF_HAVE_BLOCKS
 			   block: (OFStreamAsyncReadBlock)block
 # endif
 			delegate: (id <OFStreamDelegate>)delegate
 {
@@ -1107,11 +1107,11 @@
 
 + (void)of_addAsyncReadForStream: (OFStream <OFReadyForReadingObserving> *)
 				      stream
 			  buffer: (void *)buffer
 		     exactLength: (size_t)exactLength
-			    mode: (of_run_loop_mode_t)mode
+			    mode: (OFRunLoopMode)mode
 # ifdef OF_HAVE_BLOCKS
 			   block: (OFStreamAsyncReadBlock)block
 # endif
 			delegate: (id <OFStreamDelegate>)delegate
 {
@@ -1128,11 +1128,11 @@
 }
 
 + (void)of_addAsyncReadLineForStream: (OFStream <OFReadyForReadingObserving> *)
 					  stream
 			    encoding: (OFStringEncoding)encoding
-				mode: (of_run_loop_mode_t)mode
+				mode: (OFRunLoopMode)mode
 # ifdef OF_HAVE_BLOCKS
 			       block: (OFStreamAsyncReadLineBlock)block
 # endif
 			    delegate: (id <OFStreamDelegate>)delegate
 {
@@ -1148,11 +1148,11 @@
 }
 
 + (void)of_addAsyncWriteForStream: (OFStream <OFReadyForWritingObserving> *)
 				       stream
 			     data: (OFData *)data
-			     mode: (of_run_loop_mode_t)mode
+			     mode: (OFRunLoopMode)mode
 # ifdef OF_HAVE_BLOCKS
 			    block: (OFStreamAsyncWriteDataBlock)block
 # endif
 			 delegate: (id <OFStreamDelegate>)delegate
 {
@@ -1169,11 +1169,11 @@
 
 + (void)of_addAsyncWriteForStream: (OFStream <OFReadyForWritingObserving> *)
 				       stream
 			   string: (OFString *)string
 			 encoding: (OFStringEncoding)encoding
-			     mode: (of_run_loop_mode_t)mode
+			     mode: (OFRunLoopMode)mode
 # ifdef OF_HAVE_BLOCKS
 			    block: (OFStreamAsyncWriteStringBlock)block
 # endif
 			 delegate: (id <OFStreamDelegate>)delegate
 {
@@ -1189,11 +1189,11 @@
 	QUEUE_ITEM
 }
 
 # if !defined(OF_WII) && !defined(OF_NINTENDO_3DS)
 + (void)of_addAsyncConnectForSocket: (id)sock
-			       mode: (of_run_loop_mode_t)mode
+			       mode: (OFRunLoopMode)mode
 			   delegate: (id <OFRunLoopConnectDelegate>)delegate
 {
 	NEW_WRITE(OFRunLoopConnectQueueItem, sock, mode)
 
 	queueItem->_delegate = [delegate retain];
@@ -1201,11 +1201,11 @@
 	QUEUE_ITEM
 }
 # endif
 
 + (void)of_addAsyncAcceptForSocket: (id)sock
-			      mode: (of_run_loop_mode_t)mode
+			      mode: (OFRunLoopMode)mode
 			     block: (id)block
 			  delegate: (id)delegate
 {
 	NEW_READ(OFRunLoopAcceptQueueItem, sock, mode)
 
@@ -1218,11 +1218,11 @@
 }
 
 + (void)of_addAsyncReceiveForDatagramSocket: (OFDatagramSocket *)sock
     buffer: (void *)buffer
     length: (size_t)length
-      mode: (of_run_loop_mode_t)mode
+      mode: (OFRunLoopMode)mode
 # ifdef OF_HAVE_BLOCKS
      block: (OFDatagramSocketAsyncReceiveBlock)block
 # endif
   delegate: (id <OFDatagramSocketDelegate>)delegate
 {
@@ -1239,11 +1239,11 @@
 }
 
 + (void)of_addAsyncSendForDatagramSocket: (OFDatagramSocket *)sock
       data: (OFData *)data
   receiver: (const of_socket_address_t *)receiver
-      mode: (of_run_loop_mode_t)mode
+      mode: (OFRunLoopMode)mode
 # ifdef OF_HAVE_BLOCKS
      block: (OFDatagramSocketAsyncSendDataBlock)block
 # endif
   delegate: (id <OFDatagramSocketDelegate>)delegate
 {
@@ -1261,11 +1261,11 @@
 
 + (void)of_addAsyncReceiveForSequencedPacketSocket: (OFSequencedPacketSocket *)
 							sock
     buffer: (void *)buffer
     length: (size_t)length
-      mode: (of_run_loop_mode_t)mode
+      mode: (OFRunLoopMode)mode
 # ifdef OF_HAVE_BLOCKS
      block: (OFSequencedPacketSocketAsyncReceiveBlock)block
 # endif
   delegate: (id <OFSequencedPacketSocketDelegate>)delegate
 {
@@ -1281,11 +1281,11 @@
 	QUEUE_ITEM
 }
 
 + (void)of_addAsyncSendForSequencedPacketSocket: (OFSequencedPacketSocket *)sock
       data: (OFData *)data
-      mode: (of_run_loop_mode_t)mode
+      mode: (OFRunLoopMode)mode
 # ifdef OF_HAVE_BLOCKS
      block: (OFSequencedPacketSocketAsyncSendDataBlock)block
 # endif
   delegate: (id <OFSequencedPacketSocketDelegate>)delegate
 {
@@ -1301,12 +1301,11 @@
 }
 # undef NEW_READ
 # undef NEW_WRITE
 # undef QUEUE_ITEM
 
-+ (void)of_cancelAsyncRequestsForObject: (id)object
-				   mode: (of_run_loop_mode_t)mode
++ (void)of_cancelAsyncRequestsForObject: (id)object mode: (OFRunLoopMode)mode
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFRunLoop *runLoop = [self currentRunLoop];
 	OFRunLoopState *state = stateForMode(runLoop, mode, false);
 	OFList *queue;
@@ -1353,12 +1352,11 @@
 
 		_states = [[OFMutableDictionary alloc] init];
 
 		state = [[OFRunLoopState alloc] init];
 		@try {
-			[_states setObject: state
-				    forKey: of_run_loop_mode_default];
+			[_states setObject: state forKey: OFDefaultRunLoopMode];
 		} @finally {
 			[state release];
 		}
 
 #ifdef OF_HAVE_THREADS
@@ -1382,14 +1380,14 @@
 	[super dealloc];
 }
 
 - (void)addTimer: (OFTimer *)timer
 {
-	[self addTimer: timer forMode: of_run_loop_mode_default];
+	[self addTimer: timer forMode: OFDefaultRunLoopMode];
 }
 
-- (void)addTimer: (OFTimer *)timer forMode: (of_run_loop_mode_t)mode
+- (void)addTimer: (OFTimer *)timer forMode: (OFRunLoopMode)mode
 {
 	OFRunLoopState *state = stateForMode(self, mode, true);
 
 #ifdef OF_HAVE_THREADS
 	[state->_timersQueueMutex lock];
@@ -1409,11 +1407,11 @@
 #elif defined(OF_HAVE_THREADS)
 	[state->_condition signal];
 #endif
 }
 
-- (void)of_removeTimer: (OFTimer *)timer forMode: (of_run_loop_mode_t)mode
+- (void)of_removeTimer: (OFTimer *)timer forMode: (OFRunLoopMode)mode
 {
 	OFRunLoopState *state = stateForMode(self, mode, false);
 
 	if (state == nil)
 		return;
@@ -1440,17 +1438,17 @@
 
 #ifdef OF_AMIGAOS
 - (void)addExecSignal: (ULONG)signal target: (id)target selector: (SEL)selector
 {
 	[self addExecSignal: signal
-		    forMode: of_run_loop_mode_default
+		    forMode: OFDefaultRunLoopMode
 		     target: target
 		   selector: selector];
 }
 
 - (void)addExecSignal: (ULONG)signal
-	      forMode: (of_run_loop_mode_t)mode
+	      forMode: (OFRunLoopMode)mode
 	       target: (id)target
 	     selector: (SEL)selector
 {
 	OFRunLoopState *state = stateForMode(self, mode, true);
 
@@ -1483,17 +1481,17 @@
 - (void)removeExecSignal: (ULONG)signal
 		  target: (id)target
 		selector: (SEL)selector
 {
 	[self removeExecSignal: signal
-		       forMode: of_run_loop_mode_default
+		       forMode: OFDefaultRunLoopMode
 			target: target
 		      selector: selector];
 }
 
 - (void)removeExecSignal: (ULONG)signal
-		 forMode: (of_run_loop_mode_t)mode
+		 forMode: (OFRunLoopMode)mode
 		  target: (id)target
 		selector: (SEL)selector
 {
 	OFRunLoopState *state = stateForMode(self, mode, false);
 
@@ -1553,17 +1551,17 @@
 {
 	_stop = false;
 
 	while (!_stop &&
 	    (deadline == nil || deadline.timeIntervalSinceNow >= 0))
-		[self runMode: of_run_loop_mode_default beforeDate: deadline];
+		[self runMode: OFDefaultRunLoopMode beforeDate: deadline];
 }
 
-- (void)runMode: (of_run_loop_mode_t)mode beforeDate: (OFDate *)deadline
+- (void)runMode: (OFRunLoopMode)mode beforeDate: (OFDate *)deadline
 {
 	void *pool = objc_autoreleasePoolPush();
-	of_run_loop_mode_t previousMode = _currentMode;
+	OFRunLoopMode previousMode = _currentMode;
 	OFRunLoopState *state = stateForMode(self, mode, false);
 
 	if (state == nil)
 		return;
 
@@ -1693,12 +1691,11 @@
 	}
 }
 
 - (void)stop
 {
-	OFRunLoopState *state =
-	    stateForMode(self, of_run_loop_mode_default, false);
+	OFRunLoopState *state = stateForMode(self, OFDefaultRunLoopMode, false);
 
 	_stop = true;
 
 	if (state == nil)
 		return;