diff options
Diffstat (limited to 'source/LCM')
-rw-r--r-- | source/LCM/Hash.cpp | 3 | ||||
-rw-r--r-- | source/LCM/include/c_compiler.h | 2 | ||||
-rw-r--r-- | source/LCM/include/t_basicdefinitions.h | 2 | ||||
-rw-r--r-- | source/LCM/include/t_r15_header.h | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/source/LCM/Hash.cpp b/source/LCM/Hash.cpp index 94fb585..1b6efd5 100644 --- a/source/LCM/Hash.cpp +++ b/source/LCM/Hash.cpp @@ -78,7 +78,7 @@ void *Hash::WorkerThread(void *arg) HashRequest *request = 0; while (true) { - RemoveResult result = pThis->m_RequestQueue->RemoveHead(reinterpret_cast<void **>(&request), INFINITE); + RemoveResult result = pThis->m_RequestQueue->RemoveHead((void**)(&request), INFINITE); if (REMOVE_SUCCESS != result) { break; @@ -91,7 +91,6 @@ void *Hash::WorkerThread(void *arg) if (request->Length != 0) { SecurityAlgorithms::SHA256(request->Data_p, request->Length, request->Hash_p); } - break; case HASH_CRC16: diff --git a/source/LCM/include/c_compiler.h b/source/LCM/include/c_compiler.h index 90799b1..cac45da 100644 --- a/source/LCM/include/c_compiler.h +++ b/source/LCM/include/c_compiler.h @@ -84,7 +84,7 @@ #elif defined(__GNUC__) #ifdef __arm__ #define COMPILER_GCC_ARM -#elif defined(__linux__) +#elif (defined(__linux__) || defined(__APPLE__)) /* TARGET IS LINUX */ #define COMPILER_GCC #endif diff --git a/source/LCM/include/t_basicdefinitions.h b/source/LCM/include/t_basicdefinitions.h index 038971d..08c3560 100644 --- a/source/LCM/include/t_basicdefinitions.h +++ b/source/LCM/include/t_basicdefinitions.h @@ -75,7 +75,7 @@ #define SINT64_SUPPORTED #define UINT64_SUPPORTED #define INT64_BASE_TYPE __int64 -#elif defined(__linux__) +#elif (defined(__linux__) || defined(__APPLE__)) #define SINT64_SUPPORTED #define UINT64_SUPPORTED #define INT64_BASE_TYPE long long diff --git a/source/LCM/include/t_r15_header.h b/source/LCM/include/t_r15_header.h index f102912..e31ca8c 100644 --- a/source/LCM/include/t_r15_header.h +++ b/source/LCM/include/t_r15_header.h @@ -41,7 +41,11 @@ /** The length of the bulk extended header. */ #define BULK_EXTENDED_HEADER_LENGTH 20 /** Offset of the header in the buffer. */ +#ifndef CFG_ENABLE_LOADER_TYPE +#define HEADER_OFFSET_IN_BUFFER 0 +#else #define HEADER_OFFSET_IN_BUFFER 8 +#endif #define ALIGNED_HEADER_LENGTH ALIGN_SIZE #define ALIGNED_COMMAND_EXTENDED_HEADER_LENGTH ALIGN_SIZE |