Merged martin/autoconf at r35 to trunk

1 files changed, 6 insertions, 6 deletions

diff --git a/lib/backupclient/BackupStoreFileDiff.cpp b/lib/backupclient/BackupStoreFileDiff.cpp
index 22395151..3699eb49 100755
--- a/lib/backupclient/BackupStoreFileDiff.cpp
+++ b/lib/backupclient/BackupStoreFileDiff.cpp
@@ -105,7 +105,7 @@ void BackupStoreFile::MoveStreamPositionToBlockIndex(IOStream &rStream)
 	}
 	
 	// Work out where the index is
-	int64_t numBlocks = ntoh64(hdr.mNumBlocks);
+	int64_t numBlocks = box_ntoh64(hdr.mNumBlocks);
 	int64_t blockHeaderPosFromEnd = ((numBlocks * sizeof(file_BlockIndexEntry)) + sizeof(file_BlockIndexHeader));
 	
 	// Sanity check
@@ -298,7 +298,7 @@ static void LoadIndex(IOStream &rBlockIndex, int64_t ThisID, BlocksAvailableEntr
 	}
 	
 	// Check that we're not trying to diff against a file which references blocks from another file
-	if(((int64_t)ntoh64(hdr.mOtherFileID)) != 0)
+	if(((int64_t)box_ntoh64(hdr.mOtherFileID)) != 0)
 	{
 		THROW_EXCEPTION(BackupStoreException, CannotDiffAnIncompleteStoreFile)
 	}
@@ -307,8 +307,8 @@ static void LoadIndex(IOStream &rBlockIndex, int64_t ThisID, BlocksAvailableEntr
 	rCanDiffFromThis = true;
 
 	// Get basic information
-	int64_t numBlocks = ntoh64(hdr.mNumBlocks);
-	uint64_t entryIVBase = ntoh64(hdr.mEntryIVBase);
+	int64_t numBlocks = box_ntoh64(hdr.mNumBlocks);
+	uint64_t entryIVBase = box_ntoh64(hdr.mEntryIVBase);
 	
 	//TODO: Verify that these sizes look reasonable
 	
@@ -335,7 +335,7 @@ static void LoadIndex(IOStream &rBlockIndex, int64_t ThisID, BlocksAvailableEntr
 			uint64_t iv = entryIVBase;
 			iv += b;
 			// Network byte order
-			iv = hton64(iv);
+			iv = box_hton64(iv);
 			sBlowfishDecryptBlockEntry.SetIV(&iv);			
 			
 			// Decrypt the encrypted section
@@ -348,7 +348,7 @@ static void LoadIndex(IOStream &rBlockIndex, int64_t ThisID, BlocksAvailableEntr
 			}
 
 			// Check that we're not trying to diff against a file which references blocks from another file
-			if(((int64_t)ntoh64(entry.mEncodedSize)) <= 0)
+			if(((int64_t)box_ntoh64(entry.mEncodedSize)) <= 0)
 			{
 				THROW_EXCEPTION(BackupStoreException, CannotDiffAnIncompleteStoreFile)
 			}