Преглед изворни кода

Making sure that certain OS X only stuff is only called when compiling for the mac.

August Mueller пре 12 година
родитељ
комит
1af6d47182
1 измењених фајлова са 15 додато и 7 уклоњено
  1. 15 7
      src/FMDatabaseAdditions.m

+ 15 - 7
src/FMDatabaseAdditions.m

@@ -8,6 +8,7 @@
 
 #import "FMDatabase.h"
 #import "FMDatabaseAdditions.h"
+#import "TargetConditionals.h"
 
 @interface FMDatabase (PrivateStuff)
 - (FMResultSet *)executeQuery:(NSString *)sql withArgumentsInArray:(NSArray*)arrayArgs orDictionary:(NSDictionary *)dictionaryArgs orVAList:(va_list)args;
@@ -117,7 +118,9 @@ - (BOOL)columnExists:(NSString*)columnName inTableWithName:(NSString*)tableName
     return returnBool;
 }
 
+
 #if SQLITE_VERSION_NUMBER >= 3007017
+
 - (uint32_t)applicationID {
     
     uint32_t r = 0;
@@ -133,6 +136,15 @@ - (uint32_t)applicationID {
     return r;
 }
 
+- (void)setApplicationID:(uint32_t)appID {
+    NSString *query = [NSString stringWithFormat:@"PRAGMA application_id=%d", appID];
+    FMResultSet *rs = [self executeQuery:query];
+    [rs next];
+    [rs close];
+}
+
+
+#if TARGET_OS_MAC && !TARGET_OS_IPHONE
 - (NSString*)applicationIDString {
     NSString *s = NSFileTypeForHFSTypeCode([self applicationID]);
     
@@ -145,13 +157,6 @@ - (NSString*)applicationIDString {
     
 }
 
-- (void)setApplicationID:(uint32_t)appID {
-    NSString *query = [NSString stringWithFormat:@"PRAGMA application_id=%d", appID];
-    FMResultSet *rs = [self executeQuery:query];
-    [rs next];
-    [rs close];
-}
-
 - (void)setApplicationIDString:(NSString*)s {
     
     if ([s length] != 4) {
@@ -161,6 +166,9 @@ - (void)setApplicationIDString:(NSString*)s {
     [self setApplicationID:NSHFSTypeCodeFromFileType([NSString stringWithFormat:@"'%@'", s])];
 }
 
+
+#endif
+
 #endif
 
 #pragma clang diagnostic push