From 4c615b96229cdeaf21e739f019cd2b088b0f4d27 Mon Sep 17 00:00:00 2001
From: Bjorn Winckler <bjorn.winckler@gmail.com>
Date: Wed, 13 Aug 2008 01:03:57 +0200
Subject: [PATCH] Fix compilation problems on OS X 10.4

---
 src/MacVim/MMAppController.h | 2 +-
 src/MacVim/MMAppController.m | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/MacVim/MMAppController.h b/src/MacVim/MMAppController.h
index c7f2a5f7ef..65b166c0f5 100644
--- a/src/MacVim/MMAppController.h
+++ b/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
 
diff --git a/src/MacVim/MMAppController.m b/src/MacVim/MMAppController.m
index ff038867fc..d48be50acc 100644
--- a/src/MacVim/MMAppController.m
+++ b/src/MacVim/MMAppController.m
@@ -65,10 +65,12 @@ static NSString *MMWebsiteString = @"http://code.google.com/p/macvim/";
 // 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 @@ static int executeInLoginShell(NSString *path, NSArray *args);
 
 
 
-#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 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
 - (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 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
 - (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