@@ -1975,23 +1975,15 @@
 
 	pool = objc_autoreleasePoolPush();
 
 	characters = [self characters];
 
-#if !defined(_WIN32) && !defined(__DJGPP__)
-	if (characters[length - 1] == OF_PATH_DELIMITER)
-#else
-	if (characters[length - 1] == '/' || characters[length - 1] == '\\')
-#endif
+	if (OF_IS_PATH_DELIMITER(characters[length - 1]))
 		length--;
 
 	for (i = 0; i < length; i++) {
-#if !defined(_WIN32) && !defined(__DJGPP__)
-		if (characters[i] == OF_PATH_DELIMITER) {
-#else
-		if (characters[i] == '/' || characters[i] == '\\') {
-#endif
+		if (OF_IS_PATH_DELIMITER(characters[i])) {
 			[ret addObject: [self substringWithRange:
 			    of_range(last, i - last)]];
 
 			last = i + 1;
 		}
@@ -2018,23 +2010,15 @@
 
 	pool = objc_autoreleasePoolPush();
 
 	characters = [self characters];
 
-#if !defined(_WIN32) && !defined(__DJGPP__)
-	if (characters[length - 1] == OF_PATH_DELIMITER)
-#else
-	if (characters[length - 1] == '/' || characters[length - 1] == '\\')
-#endif
+	if (OF_IS_PATH_DELIMITER(characters[length - 1]))
 		length--;
 
 	for (i = length - 1; i >= 0; i--) {
-#if !defined(_WIN32) && !defined(__DJGPP__)
-		if (characters[i] == OF_PATH_DELIMITER) {
-#else
-		if (characters[i] == '/' || characters[i] == '\\') {
-#endif
+		if (OF_IS_PATH_DELIMITER(characters[i])) {
 			i++;
 			break;
 		}
 	}
 
@@ -2081,38 +2065,26 @@
 
 	pool = objc_autoreleasePoolPush();
 
 	characters = [self characters];
 
-#if !defined(_WIN32) && !defined(__DJGPP__)
-	if (characters[length - 1] == OF_PATH_DELIMITER)
-#else
-	if (characters[length - 1] == '/' || characters[length - 1] == '\\')
-#endif
+	if (OF_IS_PATH_DELIMITER(characters[length - 1]))
 		length--;
 
 	if (length == 0) {
 		objc_autoreleasePoolPop(pool);
 		return [self substringWithRange: of_range(0, 1)];
 	}
 
 	for (i = length - 1; i >= 1; i--) {
-#if !defined(_WIN32) && !defined(__DJGPP__)
-		if (characters[i] == OF_PATH_DELIMITER) {
-#else
-		if (characters[i] == '/' || characters[i] == '\\') {
-#endif
+		if (OF_IS_PATH_DELIMITER(characters[i])) {
 			objc_autoreleasePoolPop(pool);
 			return [self substringWithRange: of_range(0, i)];
 		}
 	}
 
-#if !defined(_WIN32) && !defined(__DJGPP__)
-	if (characters[0] == OF_PATH_DELIMITER) {
-#else
-	if (characters[0] == '/' || characters[0] == '\\') {
-#endif
+	if (OF_IS_PATH_DELIMITER(characters[0])) {
 		objc_autoreleasePoolPop(pool);
 		return [self substringWithRange: of_range(0, 1)];
 	}
 
 	objc_autoreleasePoolPop(pool);