From: ShadowFlare <blakflare@hotmail.com>
Date: Wed, 16 Jan 2013 08:45:40 +0000 (-0700)
Subject: Merge branch 'master' into large_archive
X-Git-Url: https://sfsrealm.hopto.org/projects/gitweb.cgi?p=SFmpqapi.git;a=commitdiff_plain;h=6bbe94149e12a1024072eb697324599fad99986d

Merge branch 'master' into large_archive
---

6bbe94149e12a1024072eb697324599fad99986d
diff --cc SFUtil.cpp
index 4a97b31,c5af68e..e9fffcd
--- a/SFUtil.cpp
+++ b/SFUtil.cpp
@@@ -58,14 -58,18 +58,18 @@@ UInt64 SFSetFilePointer(HANDLE hFile, I
  
  	FilePos.i64 = nDistance;
  
 -	FilePos.i32[0] = ::SetFilePointer(hFile, FilePos.i32[0], &FilePos.i32[1], dwMoveMethod);
 +	FilePos.ui32[0] = ::SetFilePointer(hFile, FilePos.i32[0], &FilePos.i32[1], dwMoveMethod);
  
+ #ifdef INVALID_SET_FILE_POINTER
  	if (FilePos.ui32[0] == INVALID_SET_FILE_POINTER) {
+ #else
+ 	if (FilePos.ui32[0] == INVALID_FILE_SIZE) {
+ #endif
  		if (::GetLastError() != NO_ERROR)
 -			return -1;
 +			return (UInt64)-1;
  	}
  
 -	return FilePos.i64;
 +	return FilePos.ui64;
  }
  
  size_t strlnlen(const char *strline)