diff --git a/src/MacVim/MMAppController.m b/src/MacVim/MMAppController.m index d6b3d0c8ad..8cb1b370e3 100644 --- a/src/MacVim/MMAppController.m +++ b/src/MacVim/MMAppController.m @@ -2076,7 +2076,7 @@ fsEventCallback(ConstFSEventStreamRef streamRef, #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) if (fsEventStream) return; - if (NULL == FSEventStreamStart) + if (NULL == &FSEventStreamStart) return; // FSEvent functions are weakly linked NSString *path = [@"~/.vim" stringByExpandingTildeInPath]; @@ -2098,7 +2098,7 @@ fsEventCallback(ConstFSEventStreamRef streamRef, - (void)stopWatchingVimDir { #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) - if (NULL == FSEventStreamStop) + if (NULL == &FSEventStreamStop) return; // FSEvent functions are weakly linked if (fsEventStream) { @@ -2489,7 +2489,7 @@ fsEventCallback(ConstFSEventStreamRef streamRef, { #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) // The TIS symbols are weakly linked. - if (NULL != TISCopyCurrentKeyboardInputSource) { + if (NULL != &TISCopyCurrentKeyboardInputSource) { // We get here when compiled on >=10.5 and running on >=10.5. id nc = [NSDistributedNotificationCenter defaultCenter]; @@ -2507,7 +2507,7 @@ fsEventCallback(ConstFSEventStreamRef streamRef, { #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) // The TIS symbols are weakly linked. - if (NULL != TISCopyCurrentKeyboardInputSource) { + if (NULL != &TISCopyCurrentKeyboardInputSource) { // We get here when compiled on >=10.5 and running on >=10.5. id nc = [NSDistributedNotificationCenter defaultCenter]; diff --git a/src/MacVim/MMTextViewHelper.m b/src/MacVim/MMTextViewHelper.m index fdc7aaf9b9..4de1dd1df7 100644 --- a/src/MacVim/MMTextViewHelper.m +++ b/src/MacVim/MMTextViewHelper.m @@ -130,7 +130,7 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b) ASLogDebug(@"%@", event); #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) - if (NULL == TISCopyCurrentKeyboardInputSource) { + if (NULL == &TISCopyCurrentKeyboardInputSource) { #endif // NOTE: Check IM state _before_ key has been interpreted or we'll pick @@ -787,7 +787,7 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b) #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) // The TIS symbols are weakly linked. - if (NULL != TISCopyCurrentKeyboardInputSource) { + if (NULL != &TISCopyCurrentKeyboardInputSource) { // We get here when compiled on >=10.5 and running on >=10.5. if (asciiImSource) { @@ -824,7 +824,7 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b) #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) // The TIS symbols are weakly linked. - if (NULL != TISCopyCurrentKeyboardInputSource) { + if (NULL != &TISCopyCurrentKeyboardInputSource) { // We get here when compiled on >=10.5 and running on >=10.5. // Enable IM: switch back to input source used when IM was last on @@ -862,7 +862,7 @@ KeyboardInputSourcesEqual(TISInputSourceRef a, TISInputSourceRef b) - (void)checkImState { #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5) - if (imControl && NULL != TISCopyCurrentKeyboardInputSource) { + if (imControl && NULL != &TISCopyCurrentKeyboardInputSource) { // We get here when compiled on >=10.5 and running on >=10.5. TISInputSourceRef cur = TISCopyCurrentKeyboardInputSource(); BOOL state = !KeyboardInputSourcesEqual(asciiImSource, cur);