6 files changed, 15 insertions, 14 deletions
diff --git a/Firebase/Database/Core/FPersistentConnection.m b/Firebase/Database/Core/FPersistentConnection.m
index 0eb1f9f..9298f6d 100644
--- a/Firebase/Database/Core/FPersistentConnection.m
+++ b/Firebase/Database/Core/FPersistentConnection.m
@@ -922,15 +922,15 @@ static void reachabilityCallback(SCNetworkReachabilityRef ref, SCNetworkReachabi
 - (void) sendConnectStats {
     NSMutableDictionary *stats = [NSMutableDictionary dictionary];
 
-#if TARGET_OS_IPHONE
+    #if TARGET_OS_IOS
     if (self.config.persistenceEnabled) {
         stats[@"persistence.ios.enabled"] = @1;
     }
-#else // this must be OSX then
+    #elif TARGET_OS_OSX
     if (self.config.persistenceEnabled) {
         stats[@"persistence.osx.enabled"] = @1;
     }
-#endif
+    #endif
     NSString *sdkVersion = [[FIRDatabase sdkVersion] stringByReplacingOccurrencesOfString:@"." withString:@"-"];
     NSString *sdkStatName = [NSString stringWithFormat:@"sdk.objc.%@", sdkVersion];
     stats[sdkStatName] = @1;
diff --git a/Firebase/Database/Core/FRepo.m b/Firebase/Database/Core/FRepo.m
index 06cc253..f04d0f1 100644
--- a/Firebase/Database/Core/FRepo.m
+++ b/Firebase/Database/Core/FRepo.m
@@ -50,7 +50,7 @@
 #import "FValueEventRegistration.h"
 #import "FEmptyNode.h"
 
-#ifdef TARGET_OS_IPHONE
+#if TARGET_OS_IOS
 #import <UIKit/UIKit.h>
 #endif
 
@@ -543,7 +543,7 @@
         return;
     
     // Targetted compilation is ONLY for testing. UIKit is weak-linked in actual release build.
-#if TARGET_OS_IPHONE
+    #if TARGET_OS_IOS
     // The idea is to wait until any outstanding sets get written to disk.  Since the sets might still be in our
     // dispatch queue, we wait for the dispatch queue to catch up and for persistence to catch up.
     // This may be undesirable though.  The dispatch queue might just be processing a bunch of incoming data or
@@ -563,7 +563,7 @@
         FFLog(@"I-RDB038018", @"Background task completed.  Queue time: %f", finishTime);
         [application endBackgroundTask:bgTask];
     });
-#endif
+    #endif
 }
 
 #pragma mark -
diff --git a/Firebase/Database/FirebaseDatabase.podspec b/Firebase/Database/FirebaseDatabase.podspec
index 4db371e..6c966ce 100644
--- a/Firebase/Database/FirebaseDatabase.podspec
+++ b/Firebase/Database/FirebaseDatabase.podspec
@@ -20,6 +20,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
   s.source           = { :git => 'https://github.com/firebase/firebase-ios-sdk.git', :tag => s.version.to_s }
   s.social_media_url = 'https://twitter.com/Firebase'
   s.ios.deployment_target = '7.0'
+  s.osx.deployment_target = '10.10'
 
   s.source_files =  '**/*.[mh]',
     'third_party/Wrap-leveldb/APLevelDB.mm',
diff --git a/Firebase/Database/Persistence/FLevelDBStorageEngine.m b/Firebase/Database/Persistence/FLevelDBStorageEngine.m
index 4b324b8..e887c08 100644
--- a/Firebase/Database/Persistence/FLevelDBStorageEngine.m
+++ b/Firebase/Database/Persistence/FLevelDBStorageEngine.m
@@ -204,13 +204,13 @@ static NSString* trackedQueryKeysKey(NSUInteger trackedQueryId, NSString *key) {
 }
 
 + (NSString *) firebaseDir {
-#if TARGET_OS_IPHONE
+    #if TARGET_OS_IOS
     NSArray *dirPaths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
     NSString *documentsDir = [dirPaths objectAtIndex:0];
     return [documentsDir stringByAppendingPathComponent:@"firebase"];
-#else // this must be OSX then
+    #elif TARGET_OS_OSX
     return [NSHomeDirectory() stringByAppendingPathComponent:@".firebase"];
-#endif
+    #endif
 }
 
 - (APLevelDB *)createDB:(NSString *)name {
diff --git a/Firebase/Database/Realtime/FWebSocketConnection.m b/Firebase/Database/Realtime/FWebSocketConnection.m
index 52e2296..ea64795 100644
--- a/Firebase/Database/Realtime/FWebSocketConnection.m
+++ b/Firebase/Database/Realtime/FWebSocketConnection.m
@@ -22,7 +22,7 @@
 #import "FStringUtilities.h"
 #import "FIRDatabase_Private.h"
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IOS
 #import <UIKit/UIKit.h>
 #endif
 
@@ -82,7 +82,7 @@
     BOOL hasUiDeviceClass = NO;
     
     // Targetted compilation is ONLY for testing. UIKit is weak-linked in actual release build.
-    #if TARGET_OS_IPHONE
+    #if TARGET_OS_IOS
     Class uiDeviceClass = NSClassFromString(@"UIDevice");
     if (uiDeviceClass) {
         systemVersion = [uiDeviceClass currentDevice].systemVersion;
diff --git a/Firebase/Database/third_party/SocketRocket/FSRWebSocket.m b/Firebase/Database/third_party/SocketRocket/FSRWebSocket.m
index c2b395c..54fcf27 100644
--- a/Firebase/Database/third_party/SocketRocket/FSRWebSocket.m
+++ b/Firebase/Database/third_party/SocketRocket/FSRWebSocket.m
@@ -16,7 +16,7 @@
 
 #import "FSRWebSocket.h"
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IOS
 #define HAS_ICU
 #endif
 
@@ -26,9 +26,9 @@
 #import <unicode/utf8.h>
 #endif
 
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IOS
 #import <Endian.h>
-#else
+#elif TARGET_OS_OSX
 #import <CoreServices/CoreServices.h>
 #endif