[Winmerge-svn] SF.net SVN: winmerge:[6678] trunk/Src/Common

[<ki...@us...>]

Revision: 6678
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6678&view=rev
Author:   kimmov
Date:     2009-04-20 17:45:33 +0000 (Mon, 20 Apr 2009)

Log Message:
-----------
Couple of 64-bit build fixes. Fix types to use correct pointer types. Fix offset to use 64-bit size.

Modified Paths:
--------------
    trunk/Src/Common/UniFile.cpp
    trunk/Src/Common/unicoder.cpp
    trunk/Src/Common/unicoder.h

Modified: trunk/Src/Common/UniFile.cpp
===================================================================
--- trunk/Src/Common/UniFile.cpp	2009-04-20 07:02:11 UTC (rev 6677)
+++ trunk/Src/Common/UniFile.cpp	2009-04-20 17:45:33 UTC (rev 6678)
@@ -349,7 +349,7 @@
 	if (!IsOpen())
 		return false;
 
-	unsigned char * lpByte = m_base;
+	PBYTE lpByte = m_base;
 	m_current = m_data = m_base;
 	m_charsize = 1;
 	bool unicode = false;

Modified: trunk/Src/Common/unicoder.cpp
===================================================================
--- trunk/Src/Common/unicoder.cpp	2009-04-20 07:02:11 UTC (rev 6677)
+++ trunk/Src/Common/unicoder.cpp	2009-04-20 17:45:33 UTC (rev 6678)
@@ -703,7 +703,7 @@
  * FF FE 00 00 UTF-32, little endian 
  * 00 00 FE FF UTF-32, big-endian 
  */
-UNICODESET DetermineEncoding(unsigned char* pBuffer, int size, bool * pBom)
+UNICODESET DetermineEncoding(PBYTE pBuffer, __int64 size, bool * pBom)
 {
 	UNICODESET unicoding = ucr::NONE;
 	*pBom = false;

Modified: trunk/Src/Common/unicoder.h
===================================================================
--- trunk/Src/Common/unicoder.h	2009-04-20 07:02:11 UTC (rev 6677)
+++ trunk/Src/Common/unicoder.h	2009-04-20 17:45:33 UTC (rev 6678)
@@ -65,7 +65,7 @@
 String CrossConvertToStringA(const char* src, unsigned int srclen, int cpin, int cpout, bool * lossy);
 #endif
 
-UNICODESET DetermineEncoding(unsigned char* pBuffer, int size, bool * pBom);
+UNICODESET DetermineEncoding(PBYTE pBuffer, __int64 size, bool * pBom);
 
 } // namespace ucr
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.