diff options
| author | Martin Ebourne <martin@ebourne.me.uk> | 2005-12-12 20:50:00 +0000 |
|---|---|---|
| committer | Martin Ebourne <martin@ebourne.me.uk> | 2005-12-12 20:50:00 +0000 |
| commit | 3bedf8846f4d7a5cb38276b274662d62a36dcd52 (patch) | |
| tree | 9d51de8b0f3d06ba6549a5a1958e52f592343140 /lib/backupclient/BackupStoreFileDiff.cpp | |
| parent | 81d8eda2419e7a23088a98cdfc52a305c9ceac0d (diff) | |
Marged chris/win32/merge/07-win32-fixes at r210 to trunk
Diffstat (limited to 'lib/backupclient/BackupStoreFileDiff.cpp')
| -rwxr-xr-x | lib/backupclient/BackupStoreFileDiff.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/backupclient/BackupStoreFileDiff.cpp b/lib/backupclient/BackupStoreFileDiff.cpp index 3699eb49..c1d0492d 100755 --- a/lib/backupclient/BackupStoreFileDiff.cpp +++ b/lib/backupclient/BackupStoreFileDiff.cpp @@ -12,7 +12,11 @@ #include <new> #include <map> #include <signal.h> +#ifdef WIN32 +#include <time.h> +#else #include <sys/time.h> +#endif #include "BackupStoreFile.h" #include "BackupStoreFileWire.h" @@ -989,7 +993,11 @@ static void GenerateRecipe(BackupStoreFileEncodeStream::Recipe &rRecipe, BlocksA for(unsigned int e = 0; e < rRecipe.size(); ++e) { char b[64]; +#ifdef WIN32 + sprintf(b, "%8I64d", (int64_t)(rRecipe[e].mpStartBlock - pIndex)); +#else sprintf(b, "%8lld", (int64_t)(rRecipe[e].mpStartBlock - pIndex)); +#endif TRACE3("%8lld %s %8lld\n", rRecipe[e].mSpaceBefore, (rRecipe[e].mpStartBlock == 0)?" -":b, (int64_t)rRecipe[e].mBlocks); } } |