Browse files

Fix compilation problems on OS X 10.4

  • Loading branch information...
1 parent c1f4a11 commit 4c615b96229cdeaf21e739f019cd2b088b0f4d27 @b4winckler committed Aug 13, 2008
Showing with 6 additions and 4 deletions.
  1. +1 −1 src/MacVim/MMAppController.h
  2. +5 −3 src/MacVim/MMAppController.m
View
2 src/MacVim/MMAppController.h
@@ -29,7 +29,7 @@
int preloadPid;
BOOL shouldActivateWhenNextWindowOpens;
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
+#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
FSEventStreamRef fsEventStream;
#endif
View
8 src/MacVim/MMAppController.m
@@ -65,10 +65,12 @@
// microseconds.
static useconds_t MMTerminationSleepPeriod = 10000;
+#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
// Latency (in s) between FS event occuring and being reported to MacVim.
// Should be small so that MacVim is notified of changes to the ~/.vim
// directory more or less immediately.
static CFTimeInterval MMEventStreamLatency = 0.1;
+#endif
#pragma options align=mac68k
@@ -130,7 +132,7 @@ - (void)addPlugInMenuToMenu:(NSMenu *)mainMenu;
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
+#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
static void
fsEventCallback(ConstFSEventStreamRef streamRef,
void *clientCallBackInfo,
@@ -1634,7 +1636,7 @@ - (void)activateWhenNextWindowOpens
- (void)startWatchingVimDir
{
//NSLog(@"%s", _cmd);
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
+#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
if (fsEventStream)
return;
if (NULL == FSEventStreamStart)
@@ -1659,7 +1661,7 @@ - (void)startWatchingVimDir
- (void)stopWatchingVimDir
{
//NSLog(@"%s", _cmd);
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
+#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
if (NULL == FSEventStreamStop)
return; // FSEvent functions are weakly linked

0 comments on commit 4c615b9

Please sign in to comment.