diff options
| author | Ladislav Zezula <zezula@volny.cz> | 2020-10-26 08:12:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-26 08:12:25 +0100 |
| commit | 6e836417806d2ca6944b2565c506590d91f21d5c (patch) | |
| tree | b6352136f402f3962d8b56cca5cccd1c7346a29f /src/SBaseCommon.cpp | |
| parent | 7e4f377e0b45c737f26309ae602addc05c9b6b30 (diff) | |
| parent | f3560fa9af389d9b8be09b4e90f668fc22ed531f (diff) | |
Merge pull request #190 from ladislav-zezula/TBitArrayChangedToPrivate
Resolved name conflicts with Unreal Engine 4
Diffstat (limited to 'src/SBaseCommon.cpp')
| -rw-r--r-- | src/SBaseCommon.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/SBaseCommon.cpp b/src/SBaseCommon.cpp index a116625..34a7a25 100644 --- a/src/SBaseCommon.cpp +++ b/src/SBaseCommon.cpp @@ -1738,7 +1738,7 @@ void CalculateDataBlockHash(void * pvDataBlock, DWORD cbDataBlock, LPBYTE md5_ha //-----------------------------------------------------------------------------
// Swapping functions
-#ifndef PLATFORM_LITTLE_ENDIAN
+#ifndef STORMLIB_LITTLE_ENDIAN
//
// Note that those functions are implemented for Mac operating system,
@@ -1863,4 +1863,4 @@ void ConvertTMPQHeader(void *header, uint16_t version) }
}
-#endif // PLATFORM_LITTLE_ENDIAN
+#endif // STORMLIB_LITTLE_ENDIAN
|