diff options
author | 2014-01-02 14:39:35 -0800 | |
---|---|---|
committer | 2014-01-02 14:39:35 -0800 | |
commit | ba7335764e83154e0755633b53319800573aa737 (patch) | |
tree | 25cc90eddc70eb39354606d591df3b9a4c625f60 | |
parent | a405e296292f1090ddf48f8778e8c70c0b0501ee (diff) |
Build fixes for Linux
-rw-r--r-- | src/core/basetypes/MCData.cc | 2 | ||||
-rw-r--r-- | src/core/basetypes/MCOperation.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/basetypes/MCData.cc b/src/core/basetypes/MCData.cc index b8520975..f8ca7e70 100644 --- a/src/core/basetypes/MCData.cc +++ b/src/core/basetypes/MCData.cc @@ -186,7 +186,7 @@ static bool isHintCharsetValid(String * hintCharset) static Set * knownCharset = NULL; pthread_mutex_lock(&lock); - if (knownCharset == nil) { + if (knownCharset == NULL) { knownCharset = new Set(); knownCharset->addObject(MCSTR("utf-8")); knownCharset->addObject(MCSTR("utf-16be")); diff --git a/src/core/basetypes/MCOperation.cc b/src/core/basetypes/MCOperation.cc index 0995340b..5587f2f6 100644 --- a/src/core/basetypes/MCOperation.cc +++ b/src/core/basetypes/MCOperation.cc @@ -9,8 +9,6 @@ Operation::Operation() pthread_mutex_init(&mLock, NULL); #if __APPLE__ mCallbackDispatchQueue = dispatch_get_main_queue(); -#else - mCallbackDispatchQueue = NULL; #endif } @@ -61,6 +59,7 @@ void Operation::start() { } +#if __APPLE__ void Operation::setCallbackDispatchQueue(dispatch_queue_t callbackDispatchQueue) { mCallbackDispatchQueue = callbackDispatchQueue; @@ -70,3 +69,4 @@ dispatch_queue_t Operation::callbackDispatchQueue() { return mCallbackDispatchQueue; } +#endif |