From d135ad92ac000dd307b1e8217edb43c87d734a14 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Sun, 7 Feb 2016 13:46:10 -0800
Subject: [PATCH] Core: Fix some issues with various threading builds

---
 src/core/log.c    | 5 ++++-
 src/core/thread.c | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/core/log.c b/src/core/log.c
index e0cc4e765..1e2cbbf80 100644
--- a/src/core/log.c
+++ b/src/core/log.c
@@ -12,7 +12,10 @@
 static struct mLogger* _defaultLogger = NULL;
 
 struct mLogger* mLogGetContext(void) {
-	struct mLogger* logger = mCoreThreadLogger();
+	struct mLogger* logger = NULL;
+#ifndef DISABLE_LOGGING
+	logger = mCoreThreadLogger();
+#endif
 	if (logger) {
 		return logger;
 	}
diff --git a/src/core/thread.c b/src/core/thread.c
index 8f2057414..3f6e0c126 100644
--- a/src/core/thread.c
+++ b/src/core/thread.c
@@ -367,6 +367,10 @@ struct mCoreThread* mCoreThreadGet(void) {
 	InitOnceExecuteOnce(&_contextOnce, _createTLS, NULL, 0);
 	return TlsGetValue(_contextKey);
 }
+#else
+struct mCoreThread* mCoreThreadGet(void) {
+	return NULL;
+}
 #endif
 
 #else