DPF

commit 95ca7b0f7d50d9ba87b06a3a890a259ae5dcd30a
parent 70e3780a63099ff9cda6122d830703a06d13b75b
Author: falkTX <falktx@gmail.com>
Date:   Sun, 22 May 2016 18:54:23 +0200

Minor MacOS build fixes

Diffstat:
M
distrho/DistrhoUtils.hpp
 | 
2
+-
M
distrho/src/DistrhoDefines.h
 | 
4
+++-

2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/distrho/DistrhoUtils.hpp b/distrho/DistrhoUtils.hpp
@@ -33,7 +33,7 @@
 # include <stdint.h>
 #endif
 
-#if defined(DISTRHO_OS_MAC) && ! defined(CARLA_OS_MAC) && ! defined(__clang__)
+#if defined(DISTRHO_OS_MAC) && ! defined(CARLA_OS_MAC) && ! (defined(DISTRHO_PROPER_CPP11_SUPPORT) && defined(__clang__))
 namespace std {
 inline float fmin(float __x, float __y)
   { return __builtin_fminf(__x, __y); }
diff --git a/distrho/src/DistrhoDefines.h b/distrho/src/DistrhoDefines.h
@@ -55,7 +55,9 @@
 
 /* Check for C++11 support */
 #if defined(HAVE_CPP11_SUPPORT)
-# define DISTRHO_PROPER_CPP11_SUPPORT
+# if HAVE_CPP11_SUPPORT
+#  define DISTRHO_PROPER_CPP11_SUPPORT
+# endif
 #elif __cplusplus >= 201103L || (defined(__GNUC__) && defined(__GXX_EXPERIMENTAL_CXX0X__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 405) || __has_extension(cxx_noexcept)
 # define DISTRHO_PROPER_CPP11_SUPPORT
 # if (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) < 407 && ! defined(__clang__)) || (defined(__clang__) && ! __has_extension(cxx_override_control))