From 916daae559d7f8fd147d38f8973efdab9afaa853 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Sun, 12 Jan 2014 20:55:08 +0000
Subject: [PATCH] some MacOS build fixes

---
 source/Makefile.mk                        | 6 +++++-
 source/modules/carla_native/vex-synth.cpp | 6 ++++++
 source/modules/jackbridge/JackBridge2.cpp | 4 ++++
 source/modules/lilv/lilv.c                | 1 +
 source/modules/theme/Makefile             | 2 +-
 source/utils/CarlaUtils.hpp               | 5 ++---
 6 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/source/Makefile.mk b/source/Makefile.mk
index f87000bd2..4aaeb273e 100644
--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -41,12 +41,16 @@ endif
 # --------------------------------------------------------------
 # Common build and link flags
 
-BASE_FLAGS = -Wall -Wextra -Wcast-qual -Wconversion -Wlogical-op -Werror -fPIC -DPIC -pipe -DREAL_BUILD
+BASE_FLAGS = -Wall -Wextra -Wcast-qual -Wconversion -fPIC -DPIC -pipe -DREAL_BUILD
 BASE_OPTS  = -O3 -ffast-math -mtune=generic -msse -msse2 -mfpmath=sse -fdata-sections -ffunction-sections
 LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,--gc-sections
 
 # -Waggregate-return -Wsign-conversion
 
+ifneq ($(MACOS),true)
+BASE_FLAGS += -Wlogical-op -Werror
+endif
+
 ifeq ($(RASPPI),true)
 # Raspberry-Pi optimization flags
 BASE_OPTS  = -O3 -ffast-math -march=armv6 -mfpu=vfp -mfloat-abi=hard
diff --git a/source/modules/carla_native/vex-synth.cpp b/source/modules/carla_native/vex-synth.cpp
index a8694508b..756e8417f 100644
--- a/source/modules/carla_native/vex-synth.cpp
+++ b/source/modules/carla_native/vex-synth.cpp
@@ -741,7 +741,13 @@ protected:
                 break;
             }
 
+#ifndef CARLA_OS_MAC
             tmpName[4] = '0' + ((index-1+24) / 24);
+#else
+            // MacOS has a problem with this
+            char* tmpBuf(const_cast<char*>(tmpName.getBuffer()));
+            tmpBuf[4] = '0' + ((index-1+24) / 24);
+#endif
 
             paramInfo.name  = (const char*)tmpName;
             paramInfo.hints = static_cast<NativeParameterHints>(hints);
diff --git a/source/modules/jackbridge/JackBridge2.cpp b/source/modules/jackbridge/JackBridge2.cpp
index 429ddbd71..29b42c3fd 100644
--- a/source/modules/jackbridge/JackBridge2.cpp
+++ b/source/modules/jackbridge/JackBridge2.cpp
@@ -18,6 +18,10 @@
 
 #include "JackBridge.hpp"
 
+#ifdef CARLA_OS_MAC
+# include <unistd.h>
+#endif
+
 #ifndef JACKBRIDGE_HPP_INCLUDED
 // don't include the whole JACK API in this file
 CARLA_EXPORT bool jackbridge_sem_init(void* sem);
diff --git a/source/modules/lilv/lilv.c b/source/modules/lilv/lilv.c
index 7690c86d4..6f540b202 100644
--- a/source/modules/lilv/lilv.c
+++ b/source/modules/lilv/lilv.c
@@ -19,6 +19,7 @@
 #include "src/lib.c"
 #include "src/node.c"
 #include "src/plugin.c"
+#undef USTR
 #include "src/pluginclass.c"
 #include "src/port.c"
 #include "src/query.c"
diff --git a/source/modules/theme/Makefile b/source/modules/theme/Makefile
index 5a91a8d62..024904d35 100644
--- a/source/modules/theme/Makefile
+++ b/source/modules/theme/Makefile
@@ -110,7 +110,7 @@ qt5: ../theme.qt5.a
 styles/carlastyle.dll: $(FILES_shared) $(OBJS_shared)
 	$(CXX) $(OBJS_shared) $(SHARED_LINK_FLAGS) -shared -o $@
 
-styles/carlastyle.dynlib: $(FILES_shared) $(OBJS_shared)
+styles/carlastyle.dylib: $(FILES_shared) $(OBJS_shared)
 	$(CXX) $(OBJS_shared) $(SHARED_LINK_FLAGS) -dynamiclib -o $@
 
 styles/carlastyle.so: $(FILES_shared) $(OBJS_shared)
diff --git a/source/utils/CarlaUtils.hpp b/source/utils/CarlaUtils.hpp
index 6148777b1..b502457d0 100644
--- a/source/utils/CarlaUtils.hpp
+++ b/source/utils/CarlaUtils.hpp
@@ -411,14 +411,13 @@ inline float
 /*
  * Clear a char array.
  */
-template<typename C = char>
 static inline
-void carla_zeroChar(C* const data, const size_t numChars) noexcept
+void carla_zeroChar(char* const data, const size_t numChars) noexcept
 {
     CARLA_SAFE_ASSERT_RETURN(data != nullptr,);
     CARLA_SAFE_ASSERT_RETURN(numChars > 0,);
 
-    std::memset(data, 0, numChars*sizeof(C));
+    std::memset(data, 0, numChars*sizeof(char));
 }
 
 /*