@@ -105,12 +105,12 @@
 	return [[[self alloc] initWithRange: range] autorelease];
 }
 
 + (OFCharacterSet *)whitespaceCharacterSet
 {
-	static of_once_t onceControl = OF_ONCE_INIT;
-	of_once(&onceControl, initWhitespaceCharacterSet);
+	static OFOnceControl onceControl = OFOnceControlInitValue;
+	OFOnce(&onceControl, initWhitespaceCharacterSet);
 
 	return whitespaceCharacterSet;
 }
 
 - (instancetype)init