Merge pull request #94 from artemist/freebsd-fix

Fix build on FreeBSD
aras-p · May 27, 2024 · 225fe2b · 225fe2b
2 parents 2ff17ba + 058150d
commit 225fe2b
Show file tree

Hide file tree

Showing 4 changed files with 911 additions and 274 deletions.
diff --git a/src/BuildEvents.h b/src/BuildEvents.h
@@ -11,7 +11,7 @@
 
 #ifdef _MSC_VER
 #define ftello64 _ftelli64
-#elif defined(__APPLE__)
+#elif defined(__APPLE__) || defined(__FreeBSD__)
 #define ftello64 ftello
 #endif
 

diff --git a/src/external/enkiTS/LockLessMultiReadPipe.h b/src/external/enkiTS/LockLessMultiReadPipe.h
@@ -19,11 +19,13 @@
 #pragma once
 
 #include <stdint.h>
-#include <assert.h>
-
 #include <atomic>
 #include <string.h>
 
+#ifndef ENKI_ASSERT
+#include <assert.h>
+#define ENKI_ASSERT(x) assert(x)
+#endif
 
 namespace enki
 {
@@ -90,7 +92,7 @@ namespace enki
  , m_ReadCount(0)
  , m_ReadIndex(0)
  {
- assert( cSizeLog2 < 32 );
+ ENKI_ASSERT( cSizeLog2 < 32 );
  memset( (void*)m_Flags, 0, sizeof( m_Flags ) );
  }
 
@@ -241,7 +243,7 @@ namespace enki
  // Add - safe to perform from any thread
  void WriterWriteFront( T* pNode_ )
  {
- assert( pNode_ );
+ ENKI_ASSERT( pNode_ );
  pNode_->pNext = NULL;
  T* pPrev = pHead.exchange( pNode_ );
  pPrev->pNext = pNode_;