@@ -140,11 +140,11 @@
 	return field;
 }
 
 static void
 seekOrThrowInvalidFormat(OFSeekableStream *stream,
-    OFFileOffset offset, int whence)
+    OFStreamOffset offset, int whence)
 {
 	@try {
 		[stream seekToOffset: offset whence: whence];
 	} @catch (OFSeekFailedException *e) {
 		if (e.errNo == EINVAL)
@@ -199,11 +199,11 @@
 		}
 
 		if (_mode == modeAppend) {
 			_offset = _centralDirectoryOffset;
 			seekOrThrowInvalidFormat((OFSeekableStream *)_stream,
-			    (OFFileOffset)_offset, SEEK_SET);
+			    (OFStreamOffset)_offset, SEEK_SET);
 		}
 	} @catch (id e) {
 		/*
 		 * If we are in write or append mode, we do not want -[close]
 		 * to write anything to it on error - after all, it might not
@@ -257,11 +257,11 @@
 
 - (void)of_readZIPInfo
 {
 	void *pool = objc_autoreleasePoolPush();
 	uint16_t commentLength;
-	OFFileOffset offset = -22;
+	OFStreamOffset offset = -22;
 	bool valid = false;
 
 	do {
 		seekOrThrowInvalidFormat((OFSeekableStream *)_stream,
 		    offset, SEEK_END);
@@ -309,15 +309,15 @@
 		 * central directory record.
 		 */
 		[_stream readLittleEndianInt32];
 		offset64 = [_stream readLittleEndianInt64];
 
-		if (offset64 < 0 || (OFFileOffset)offset64 != offset64)
+		if (offset64 < 0 || (OFStreamOffset)offset64 != offset64)
 			@throw [OFOutOfRangeException exception];
 
 		seekOrThrowInvalidFormat((OFSeekableStream *)_stream,
-		    (OFFileOffset)offset64, SEEK_SET);
+		    (OFStreamOffset)offset64, SEEK_SET);
 
 		if ([_stream readLittleEndianInt32] != 0x06064B50)
 			@throw [OFInvalidFormatException exception];
 
 		size = [_stream readLittleEndianInt64];
@@ -336,11 +336,11 @@
 		_centralDirectoryEntries = [_stream readLittleEndianInt64];
 		_centralDirectorySize = [_stream readLittleEndianInt64];
 		_centralDirectoryOffset = [_stream readLittleEndianInt64];
 
 		if (_centralDirectoryOffset < 0 ||
-		    (OFFileOffset)_centralDirectoryOffset !=
+		    (OFStreamOffset)_centralDirectoryOffset !=
 		    _centralDirectoryOffset)
 			@throw [OFOutOfRangeException exception];
 	}
 
 	objc_autoreleasePoolPop(pool);
@@ -349,15 +349,15 @@
 - (void)of_readEntries
 {
 	void *pool = objc_autoreleasePoolPush();
 
 	if (_centralDirectoryOffset < 0 ||
-	    (OFFileOffset)_centralDirectoryOffset != _centralDirectoryOffset)
+	    (OFStreamOffset)_centralDirectoryOffset != _centralDirectoryOffset)
 		@throw [OFOutOfRangeException exception];
 
 	seekOrThrowInvalidFormat((OFSeekableStream *)_stream,
-	    (OFFileOffset)_centralDirectoryOffset, SEEK_SET);
+	    (OFStreamOffset)_centralDirectoryOffset, SEEK_SET);
 
 	for (size_t i = 0; i < _centralDirectoryEntries; i++) {
 		OFZIPArchiveEntry *entry = [[[OFZIPArchiveEntry alloc]
 		    of_initWithStream: _stream] autorelease];
 
@@ -445,15 +445,15 @@
 							      errNo: ENOENT];
 
 	[self of_closeLastReturnedStream];
 
 	offset64 = entry.of_localFileHeaderOffset;
-	if (offset64 < 0 || (OFFileOffset)offset64 != offset64)
+	if (offset64 < 0 || (OFStreamOffset)offset64 != offset64)
 		@throw [OFOutOfRangeException exception];
 
 	seekOrThrowInvalidFormat((OFSeekableStream *)_stream,
-	    (OFFileOffset)offset64, SEEK_SET);
+	    (OFStreamOffset)offset64, SEEK_SET);
 	localFileHeader = [[[OFZIPArchiveLocalFileHeader alloc]
 	    initWithStream: _stream] autorelease];
 
 	if (![localFileHeader matchesEntry: entry])
 		@throw [OFInvalidFormatException exception];