@@ -270,11 +270,11 @@
 		if (pos != OFNotFound)
 			line = [line substringToIndex: pos];
 
 		components = [line
 		    componentsSeparatedByCharactersInSet: whitespaceCharacterSet
-						 options: OF_STRING_SKIP_EMPTY];
+		    options: OFStringSkipEmptyComponents];
 
 		if (components.count < 2)
 			continue;
 
 		address = components.firstObject;
@@ -371,11 +371,11 @@
 		if (pos != OFNotFound)
 			line = [line substringToIndex: pos];
 
 		components = [line
 		    componentsSeparatedByCharactersInSet: whitespaceCharacterSet
-						 options: OF_STRING_SKIP_EMPTY];
+		    options: OFStringSkipEmptyComponents];
 
 		if (components.count < 2) {
 			objc_autoreleasePoolPop(pool2);
 			continue;
 		}