From 80f18e24736de25141a321a49d29eb07b90b5264 Mon Sep 17 00:00:00 2001
From: Linus Dierheimer <Linus@Dierheimer.de>
Date: Fri, 23 Sep 2022 00:49:43 +0200
Subject: [PATCH] Don't force inline

---
 run.sh                   | 4 +++-
 src/util/FFcheckmacros.h | 6 ------
 src/util/FFstrbuf.h      | 8 ++++----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/run.sh b/run.sh
index 8c223dd38..472d5ffea 100755
--- a/run.sh
+++ b/run.sh
@@ -10,8 +10,10 @@ if [ -z "${CMAKE_BUILD_TYPE}" ]; then
 fi
 cmake "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" ..
 
-if [ -z "$OSTYPE" ] || [ "$OSTYPE" = "linux-gnu" ]; then
+if [ -z "$OSTYPE" ] || [ "$OSTYPE" = "linux-gnu"* ]; then
     cmake_build_args="-j$(nproc)"
+elif [ "$OSTYPE" = "darwin"* ]; then
+    cmake_build_args="-j$(sysctl -n hw.ncpu)"
 else
     cmake_build_args=""
 fi
diff --git a/src/util/FFcheckmacros.h b/src/util/FFcheckmacros.h
index be5bad5dc..1ed61cf82 100644
--- a/src/util/FFcheckmacros.h
+++ b/src/util/FFcheckmacros.h
@@ -21,10 +21,4 @@
     #define FF_C_SCANF(formatStrIndex, argsStartIndex)
 #endif
 
-#if defined(__GNUC__) || defined(__clang__)
-    #define FF_C_INLINE __attribute__((always_inline)) static inline
-#else
-    #define FF_C_INLINE static inline
-#endif
-
 #endif
diff --git a/src/util/FFstrbuf.h b/src/util/FFstrbuf.h
index 26a3fd876..45ed1123d 100644
--- a/src/util/FFstrbuf.h
+++ b/src/util/FFstrbuf.h
@@ -26,8 +26,8 @@ void ffStrbufInit(FFstrbuf* strbuf);
 void ffStrbufInitA(FFstrbuf* strbuf, uint32_t allocate);
 void ffStrbufInitCopy(FFstrbuf* strbuf, const FFstrbuf* src);
 
-FF_C_INLINE void ffStrbufAppendS(FFstrbuf* strbuf, const char* value);
-FF_C_INLINE void ffStrbufInitS(FFstrbuf* strbuf, const char* str)
+static inline void ffStrbufAppendS(FFstrbuf* strbuf, const char* value);
+static inline void ffStrbufInitS(FFstrbuf* strbuf, const char* str)
 {
     ffStrbufInitA(strbuf, 0);
     ffStrbufAppendS(strbuf, str);
@@ -46,7 +46,7 @@ void ffStrbufAppendC(FFstrbuf* strbuf, char c);
 
 void ffStrbufAppendNS(FFstrbuf* strbuf, uint32_t length, const char* value);
 
-FF_C_INLINE void ffStrbufAppendS(FFstrbuf* strbuf, const char* value)
+static inline void ffStrbufAppendS(FFstrbuf* strbuf, const char* value)
 {
     if(value == NULL)
         return;
@@ -64,7 +64,7 @@ void ffStrbufPrependNS(FFstrbuf* strbuf, uint32_t length, const char* value);
 void ffStrbufSetNS(FFstrbuf* strbuf, uint32_t length, const char* value);
 void ffStrbufSet(FFstrbuf* strbuf, const FFstrbuf* value);
 
-FF_C_INLINE void ffStrbufSetS(FFstrbuf* strbuf, const char* value)
+static inline void ffStrbufSetS(FFstrbuf* strbuf, const char* value)
 {
     ffStrbufClear(strbuf);
     ffStrbufAppendNS(strbuf, (uint32_t) strlen(value), value);