diff options
| author | Lukas Zeller <luz@synthesis.ch> | 2009-11-24 21:04:05 +0100 |
|---|---|---|
| committer | Lukas Zeller <luz@synthesis.ch> | 2009-11-25 00:12:27 +0100 |
| commit | 933eeacd81df990c3a31aff6602dc393b5651cbf (patch) | |
| tree | fbb2dab26ebb75e261761e8535c9ec284662752f /src | |
| parent | 8043bc73f304658546b259562d2111cdfbe21bbc (diff) | |
engine 3.3.0.4: fixed some more 64bit gotchas
64bit build of the engine did not work correctly
in Mac OS X due to some invalid casts etc.
Diffstat (limited to 'src')
| -rw-r--r-- | src/global_options.h | 4 | ||||
| -rw-r--r-- | src/sysync/engineinterface.cpp | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/global_options.h b/src/global_options.h index e7c864f..8e0a6fb 100644 --- a/src/global_options.h +++ b/src/global_options.h @@ -71,8 +71,8 @@ #endif #ifndef SYSYNC_BUILDNUMBER -#define SYSYNC_BUILDNUMBER 3 -#define SYSYNC_BUILDNUMBER_TXT "3" +#define SYSYNC_BUILDNUMBER 4 +#define SYSYNC_BUILDNUMBER_TXT "4" #endif diff --git a/src/sysync/engineinterface.cpp b/src/sysync/engineinterface.cpp index 4c5f686..e2e535d 100644 --- a/src/sysync/engineinterface.cpp +++ b/src/sysync/engineinterface.cpp @@ -1264,6 +1264,7 @@ TSyError TEngineInterface::SessionStep (SessionH aSessionH, uInt16 &aStepCmd, TE TSyError TEngineInterface::GetSyncMLBuffer(SessionH aSessionH, bool aForSend, appPointer &aBuffer, memSize &aBufSize) { Ret_t rc; + MemSize_t bufSz; // Note: this is SML_TK definition of memsize! // get SML instance for this session (note that "session" could be a SAN checker as well) InstanceID_t myInstance = getSmlInstanceOfSession(aSessionH); if (myInstance==0) @@ -1274,16 +1275,18 @@ TSyError TEngineInterface::GetSyncMLBuffer(SessionH aSessionH, bool aForSend, ap rc=smlLockReadBuffer( myInstance, (unsigned char **)&aBuffer, // receives address of buffer containing SyncML to send - (long *)&aBufSize // receives size of SyncML to send + &bufSz // receives size of SyncML to send ); + aBufSize = bufSz; } else { // we want to write the SyncML buffer rc=smlLockWriteBuffer( myInstance, (unsigned char **)&aBuffer, // receives address of buffer where received SyncML can be put - (long *)&aBufSize // capacity of the buffer + &bufSz // capacity of the buffer ); + aBufSize = bufSz; } // check error if (rc!=SML_ERR_OK) |