@@ -23,10 +23,11 @@
 #import "OFFile.h"
 #import "OFString.h"
 #import "OFArray.h"
 #import "OFAutoreleasePool.h"
 #import "OFExceptions.h"
+#import "macros.h"
 
 #ifdef _WIN32
 # import <windows.h>
 #endif
 
@@ -42,16 +43,10 @@
 #endif
 
 #define DEFAULT_MODE S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH
 #define DIR_MODE DEFAULT_MODE | S_IXUSR | S_IXGRP | S_IXOTH
 
-#ifndef _WIN32
-# define PATH_DELIM '/'
-#else
-# define PATH_DELIM '\\'
-#endif
-
 OFFile *of_stdin = nil;
 OFFile *of_stdout = nil;
 OFFile *of_stderr = nil;
 
 static int parse_mode(const char *mode)
@@ -119,15 +114,15 @@
 	ssize_t i;
 
 	if (path_len == 0)
 		return @"";
 
-	if (path_c[path_len - 1] == PATH_DELIM)
+	if (path_c[path_len - 1] == OF_PATH_DELIM)
 		path_len--;
 
 	for (i = path_len - 1; i >= 0; i--) {
-		if (path_c[i] == PATH_DELIM) {
+		if (path_c[i] == OF_PATH_DELIM) {
 			i++;
 			break;
 		}
 	}