Update #if guards in base/ that control whether to use stat or stat64 (and friends).

base/file_util_posix.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/file_util.h"
 
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <fnmatch.h>
@@ skipping 40 matching lines @@
 #endif
 
 #if !defined(OS_IOS)
 #include <grp.h>
 #endif
 
 namespace file_util {
 
 namespace {
 
-#if defined(OS_BSD) || defined(OS_IOS) || (defined(OS_MACOSX) && \
-    MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5)
+#if defined(OS_BSD) || defined(OS_IOS) || defined(OS_MACOSX)

[Mark Mentovai, 2012/07/19 20:38:41]

Doesn’t OS_IOS imply OS_MACOSX? You should be able to just check OS_MACOSX.

[Robert Sesek, 2012/07/19 20:43:01]

Yes, it does. base/build_config.h:

#if defined(__APPLE__)
#define OS_MACOSX 1
#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
#define OS_IOS 1
#endif  // defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
#elif
...

 typedef struct stat stat_wrapper_t;
 static int CallStat(const char *path, stat_wrapper_t *sb) {
   base::ThreadRestrictions::AssertIOAllowed();
   return stat(path, sb);
 }
 static int CallLstat(const char *path, stat_wrapper_t *sb) {
   base::ThreadRestrictions::AssertIOAllowed();
   return lstat(path, sb);
 }
 #else
@@ skipping 1079 matching lines @@
 
     allowed_group_ids.insert(group_record->gr_gid);
   }
 
   return VerifyPathControlledByUser(
       kFileSystemRoot, path, kRootUid, allowed_group_ids);
 }
 #endif  // defined(OS_MACOSX)
 
 }  // namespace file_util