From a43107b29c2236d47e447c9039674b9040a9ec25 Mon Sep 17 00:00:00 2001
From: "gtm.daemon" <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>
Date: Thu, 14 Jun 2012 12:00:23 +0000
Subject: [Author: thomasvl]

Pile of fixes for trunk version of clang.

R=dmaclach
DELTA=59  (26 added, 0 deleted, 33 changed)
---
 Foundation/GTMNSFileManager+PathTest.m | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'Foundation/GTMNSFileManager+PathTest.m')

diff --git a/Foundation/GTMNSFileManager+PathTest.m b/Foundation/GTMNSFileManager+PathTest.m
index db51c9b..cfcab0c 100644
--- a/Foundation/GTMNSFileManager+PathTest.m
+++ b/Foundation/GTMNSFileManager+PathTest.m
@@ -39,7 +39,7 @@
   if (baseDir_) {
     // clean up our directory
     NSFileManager *fm = [NSFileManager defaultManager];
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+#if GTM_IPHONE_SDK || (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5)
     NSError *error = nil;
     [fm removeItemAtPath:baseDir_ error:&error];
     STAssertNil(error,
@@ -53,7 +53,7 @@
   }
 }
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
+#if GTM_MACOSX_SDK && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5)
 
 - (void)testCreateFullPathToDirectoryAttributes {
   STAssertNotNil(baseDir_, @"setUp failed");
@@ -82,7 +82,7 @@
                 @"Should have failed when passed (nil)");
 }
 
-#endif // MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
+#endif  // GTM_MACOSX_SDK && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5)
 
 - (void)testfilePathsWithExtensionsInDirectory {
   STAssertNotNil(baseDir_, @"setUp failed");
@@ -126,7 +126,7 @@
     NSString *testDir = nil;
     if ([testDirs[i] length]) {
       testDir = [baseDir_ stringByAppendingPathComponent:testDirs[i]];
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+#if GTM_IPHONE_SDK || (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5)
       NSError *error = nil;
       STAssertTrue([fm createDirectoryAtPath:testDir
                  withIntermediateDirectories:YES 
@@ -236,7 +236,7 @@
 
   // create the empty dir
   NSString *emptyDir = [baseDir_ stringByAppendingPathComponent:@"emptyDir"];
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+#if GTM_IPHONE_SDK || (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5)
   NSError *error = nil;
   STAssertTrue([fm createDirectoryAtPath:emptyDir 
              withIntermediateDirectories:YES 
-- 
cgit v1.2.3