@@ -775,11 +775,11 @@
 	}
 # endif
 #endif
 
 	pageSize = [OFSystemInfo pageSize];
-	buffer = of_alloc(1, pageSize);
+	buffer = OFAllocMemory(1, pageSize);
 	@try {
 #ifndef OF_WINDOWS
 		if (strftime(buffer, pageSize, format.UTF8String, &tm) == 0)
 			@throw [OFOutOfRangeException exception];
 
@@ -790,11 +790,11 @@
 			@throw [OFOutOfRangeException exception];
 
 		ret = [OFString stringWithUTF16String: buffer];
 #endif
 	} @finally {
-		free(buffer);
+		OFFreeMemory(buffer);
 	}
 
 	return ret;
 }
 
@@ -835,11 +835,11 @@
 	}
 # endif
 #endif
 
 	pageSize = [OFSystemInfo pageSize];
-	buffer = of_alloc(1, pageSize);
+	buffer = OFAllocMemory(1, pageSize);
 	@try {
 #ifndef OF_WINDOWS
 		if (strftime(buffer, pageSize, format.UTF8String, &tm) == 0)
 			@throw [OFOutOfRangeException exception];
 
@@ -850,11 +850,11 @@
 			@throw [OFOutOfRangeException exception];
 
 		ret = [OFString stringWithUTF16String: buffer];
 #endif
 	} @finally {
-		free(buffer);
+		OFFreeMemory(buffer);
 	}
 
 	return ret;
 }