@@ -94,18 +94,18 @@
 	@try {
 		void *pool = objc_autoreleasePoolPush();
 		OFString *targetFileName;
 
 		_fileName = [stringFromBuffer(header, 100, encoding) copy];
-		_mode = (uint32_t)octalValueFromBuffer(
-		    header + 100, 8, UINT32_MAX);
-		_UID = (uint32_t)octalValueFromBuffer(
-		    header + 108, 8, UINT32_MAX);
-		_GID = (uint32_t)octalValueFromBuffer(
-		    header + 116, 8, UINT32_MAX);
-		_size = (uint64_t)octalValueFromBuffer(
-		    header + 124, 12, UINT64_MAX);
+		_mode = (unsigned long)octalValueFromBuffer(
+		    header + 100, 8, ULONG_MAX);
+		_UID = (unsigned long)octalValueFromBuffer(
+		    header + 108, 8, ULONG_MAX);
+		_GID = (unsigned long)octalValueFromBuffer(
+		    header + 116, 8, ULONG_MAX);
+		_size = (unsigned long long)octalValueFromBuffer(
+		    header + 124, 12, ULLONG_MAX);
 		_modificationDate = [[OFDate alloc]
 		    initWithTimeIntervalSince1970:
 		    (of_time_interval_t)octalValueFromBuffer(
 		    header + 136, 12, ULLONG_MAX)];
 		_type = header[156];
@@ -123,14 +123,14 @@
 			_owner = [stringFromBuffer(header + 265, 32, encoding)
 			    copy];
 			_group = [stringFromBuffer(header + 297, 32, encoding)
 			    copy];
 
-			_deviceMajor = (uint32_t)octalValueFromBuffer(
-			    header + 329, 8, UINT32_MAX);
-			_deviceMinor = (uint32_t)octalValueFromBuffer(
-			    header + 337, 8, UINT32_MAX);
+			_deviceMajor = (unsigned long)octalValueFromBuffer(
+			    header + 329, 8, ULONG_MAX);
+			_deviceMinor = (unsigned long)octalValueFromBuffer(
+			    header + 337, 8, ULONG_MAX);
 
 			prefix = stringFromBuffer(header + 345, 155, encoding);
 			if (prefix.length > 0) {
 				OFString *fileName = [OFString
 				    stringWithFormat: @"%@/%@",
@@ -207,26 +207,26 @@
 - (OFString *)fileName
 {
 	return _fileName;
 }
 
-- (uint32_t)mode
+- (unsigned long)mode
 {
 	return _mode;
 }
 
-- (uint32_t)UID
+- (unsigned long)UID
 {
 	return _UID;
 }
 
-- (uint32_t)GID
+- (unsigned long)GID
 {
 	return _GID;
 }
 
-- (uint64_t)size
+- (unsigned long long)size
 {
 	return _size;
 }
 
 - (OFDate *)modificationDate
@@ -252,16 +252,16 @@
 - (OFString *)group
 {
 	return _group;
 }
 
-- (uint32_t)deviceMajor
+- (unsigned long)deviceMajor
 {
 	return _deviceMajor;
 }
 
-- (uint32_t)deviceMinor
+- (unsigned long)deviceMinor
 {
 	return _deviceMinor;
 }
 
 - (OFString *)description
@@ -293,11 +293,11 @@
 
 - (void)of_writeToStream: (OFStream *)stream
 		encoding: (of_string_encoding_t)encoding
 {
 	unsigned char buffer[512];
-	uint64_t modificationDate;
+	unsigned long long modificationDate;
 	uint16_t checksum = 0;
 
 	stringToBuffer(buffer, _fileName, 100, encoding);
 	stringToBuffer(buffer + 100,
 	    [OFString stringWithFormat: @"%06" PRIo16 " ", _mode], 8,
@@ -311,11 +311,11 @@
 	stringToBuffer(buffer + 124,
 	    [OFString stringWithFormat: @"%011" PRIo64 " ", _size], 12,
 	    OF_STRING_ENCODING_ASCII);
 	modificationDate = _modificationDate.timeIntervalSince1970;
 	stringToBuffer(buffer + 136,
-	    [OFString stringWithFormat: @"%011" PRIo64 " ", modificationDate],
+	    [OFString stringWithFormat: @"%011llo", modificationDate],
 	    12, OF_STRING_ENCODING_ASCII);
 
 	/*
 	 * During checksumming, the checksum field is expected to be set to 8
 	 * spaces.