From ebd9a44288928bdac1263da4bdc661bd036fe61b Mon Sep 17 00:00:00 2001
From: Casey Langen <casey.langen@gmail.com>
Date: Fri, 27 May 2016 11:47:00 -0700
Subject: [PATCH] Fixed a bunch of warnings regarding shared library calling
 convention on OSX.

---
 src/core/plugin/PluginFactory.cpp | 3 ++-
 src/core/sdk/config.h             | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/core/plugin/PluginFactory.cpp b/src/core/plugin/PluginFactory.cpp
index 9a2f48fdf..4b0d56806 100644
--- a/src/core/plugin/PluginFactory.cpp
+++ b/src/core/plugin/PluginFactory.cpp
@@ -121,7 +121,8 @@ void PluginFactory::LoadPlugins(){
                         dll = dlopen(filename.c_str(), RTLD_LOCAL);
                     }
                     catch (...) {
-                        err = "exception caught loading plugin";
+                        musik::debug::err(TAG, "exception while loading plugin " + filename);
+                        continue;
                     }
 
                     if (err != NULL || (err = dlerror()) != NULL) {
diff --git a/src/core/sdk/config.h b/src/core/sdk/config.h
index c18785de8..a747b4641 100755
--- a/src/core/sdk/config.h
+++ b/src/core/sdk/config.h
@@ -52,6 +52,10 @@
     typedef unsigned long long UINT64;
     typedef long long __int64;
 
+#ifdef __APPLE__
+    #define STDCALL(fp) (* fp)()
+#else
     #define STDCALL(fp) (* fp)() __attribute__((stdcall))
+#endif
     #define _ASSERT assert
 #endif