all repos — mgba @ d135ad92ac000dd307b1e8217edb43c87d734a14

mGBA Game Boy Advance Emulator

Core: Fix some issues with various threading builds
Jeffrey Pfau jeffrey@endrift.com
Sun, 07 Feb 2016 13:46:10 -0800
commit

d135ad92ac000dd307b1e8217edb43c87d734a14

parent

2e0ee682a589c08d965a57b70c772141e8ca042f

2 files changed, 8 insertions(+), 1 deletions(-)

jump to
M src/core/log.csrc/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; }
M src/core/thread.csrc/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