1
From: David Bremner <bremner@unb.ca>
2
Date: Wed, 24 Nov 2010 15:06:00 -0800
3
Subject: [PATCH] patch from Patrick Ohly: convert explicitly between sysync::memSize and size_t.
4
This is to address a FTBFS on s390
7
src/syncevo/SyncSource.h | 15 ++++++++++++++-
8
1 files changed, 14 insertions(+), 1 deletions(-)
10
diff --git a/src/syncevo/SyncSource.h b/src/syncevo/SyncSource.h
11
index f9053c8..ccd3587 100644
12
--- a/src/syncevo/SyncSource.h
13
+++ b/src/syncevo/SyncSource.h
14
@@ -1713,7 +1713,20 @@ class SyncSourceBlob : public virtual SyncSourceBase
15
void **aBlkPtr, size_t *aBlkSize,
17
bool aFirst, bool *aLast) {
18
- return m_blob.ReadBlob(aID, aBlobID, aBlkPtr, aBlkSize, aTotSize, aFirst, aLast);
19
+ // Translate between sysync::memSize and size_t, which
20
+ // is different on s390 (or at least the compiler complains...).
21
+ sysync::memSize blksize, totsize;
22
+ sysync::TSyError err = m_blob.ReadBlob(aID, aBlobID, aBlkPtr,
23
+ aBlkSize ? &blksize : NULL,
24
+ aTotSize ? &totsize : NULL,
27
+ *aBlkSize = blksize;
30
+ *aTotSize = totsize;
34
sysync::TSyError writeBlob(sysync::cItemID aID, const char *aBlobID,
35
void *aBlkPtr, size_t aBlkSize,