@@ -1040,11 +1040,11 @@
 
 	objc_autoreleasePoolPop(pool);
 }
 
 - (of_range_t)rangeOfString: (OFString*)string
-		    options: (of_string_search_options_t)options
+		    options: (int)options
 		      range: (of_range_t)range
 {
 	const char *cString = [string UTF8String];
 	size_t i, cStringLength = [string UTF8StringLength];
 	size_t rangeLocation, rangeLength;
@@ -1158,16 +1158,17 @@
 	return !memcmp(s->cString + (s->cStringLength - cStringLength),
 	    [suffix UTF8String], cStringLength);
 }
 
 - (OFArray*)componentsSeparatedByString: (OFString*)delimiter
-			      skipEmpty: (BOOL)skipEmpty
+				options: (int)options
 {
 	void *pool;
 	OFMutableArray *array;
 	const char *cString = [delimiter UTF8String];
 	size_t cStringLength = [delimiter UTF8StringLength];
+	BOOL skipEmpty = (options & OF_STRING_SKIP_EMPTY);
 	size_t i, last;
 	OFString *component;
 
 	array = [OFMutableArray array];
 	pool = objc_autoreleasePoolPush();