diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/md/datasource/datatargetreader.cpp | 6 | ||||
| -rw-r--r-- | src/md/datasource/targettypes.cpp | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/md/datasource/datatargetreader.cpp b/src/md/datasource/datatargetreader.cpp index 03b9811e4a..3c32f61bce 100644 --- a/src/md/datasource/datatargetreader.cpp +++ b/src/md/datasource/datatargetreader.cpp @@ -163,7 +163,13 @@ void DataTargetReader::Align(DWORD alignmentBytes) void DataTargetReader::AlignBase() { +#ifdef _MSC_VER + // Windows MSVC compiler aligns structs based on the largest field size Align(m_currentStructureAlign); +#else + // clang (on all platforms) aligns structs always on 4 byte boundaries + Align(4); +#endif } HRESULT DataTargetReader::GetRemotePointerSize(ULONG32* pPointerSize) diff --git a/src/md/datasource/targettypes.cpp b/src/md/datasource/targettypes.cpp index 9af7dd15da..cb6b8a168b 100644 --- a/src/md/datasource/targettypes.cpp +++ b/src/md/datasource/targettypes.cpp @@ -134,9 +134,12 @@ m_tableMax(0) HRESULT Target_MapSHash::ReadFrom(DataTargetReader & reader) { HRESULT hr = S_OK; + // Only the Windows MSVC compiler does this; not clang on Linux +#ifdef _MSC_VER IfFailRet(reader.Skip8()); // this byte gets used by the base class even though it has no members // I'm guessing this is so the 2nd base class (noncopyable) doesn't start at the same // location, but I can't be sure. Whatever the cause, the layout skips a byte. +#endif // _MSC_VER IfFailRet(reader.ReadPointer(&m_table)); IfFailRet(reader.Read32(&m_tableSize)); IfFailRet(reader.Read32(&m_tableCount)); |