Core: Fix some issues with various threading builds

This commit is contained in:
Jeffrey Pfau 2016-02-07 13:46:10 -08:00
parent 2e0ee682a5
commit d135ad92ac
2 changed files with 8 additions and 1 deletions

View File

@ -12,7 +12,10 @@
static struct mLogger* _defaultLogger = NULL; static struct mLogger* _defaultLogger = NULL;
struct mLogger* mLogGetContext(void) { struct mLogger* mLogGetContext(void) {
struct mLogger* logger = mCoreThreadLogger(); struct mLogger* logger = NULL;
#ifndef DISABLE_LOGGING
logger = mCoreThreadLogger();
#endif
if (logger) { if (logger) {
return logger; return logger;
} }

View File

@ -367,6 +367,10 @@ struct mCoreThread* mCoreThreadGet(void) {
InitOnceExecuteOnce(&_contextOnce, _createTLS, NULL, 0); InitOnceExecuteOnce(&_contextOnce, _createTLS, NULL, 0);
return TlsGetValue(_contextKey); return TlsGetValue(_contextKey);
} }
#else
struct mCoreThread* mCoreThreadGet(void) {
return NULL;
}
#endif #endif
#else #else