summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-19 22:24:02 +0000
committerrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-19 22:24:02 +0000
commit07a3522939e2b7667f6c4380b2830efc0ebaac3d (patch)
tree770009f9c5e247deaa280beaa3887aaee086a810
parent6d2dc98e938a0ff4da17e78e96ae6261bece64ef (diff)
downloadchromium_src-07a3522939e2b7667f6c4380b2830efc0ebaac3d.zip
chromium_src-07a3522939e2b7667f6c4380b2830efc0ebaac3d.tar.gz
chromium_src-07a3522939e2b7667f6c4380b2830efc0ebaac3d.tar.bz2
Update #if guards in base/ that control whether to use stat or stat64 (and friends).
Mac SDKs earlier than 10.5 did not define fstat64. The 10.5 SDK defined both fstat and fstat64. And in the 10.6 SDK, fstat64 is deprecated and the right implementation is selected at runtime. This makes the use of fstat unconditional on OS_MACOSX now that the build SDK is 10.6. BUG=137676 TEST=compiles Review URL: https://chromiumcodereview.appspot.com/10808037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147554 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--base/file_util_posix.cc3
-rw-r--r--base/platform_file_posix.cc3
2 files changed, 2 insertions, 4 deletions
diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc
index 56dc8501..f198f44 100644
--- a/base/file_util_posix.cc
+++ b/base/file_util_posix.cc
@@ -58,8 +58,7 @@ 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_MACOSX)
typedef struct stat stat_wrapper_t;
static int CallStat(const char *path, stat_wrapper_t *sb) {
base::ThreadRestrictions::AssertIOAllowed();
diff --git a/base/platform_file_posix.cc b/base/platform_file_posix.cc
index e592da5..112b6a1 100644
--- a/base/platform_file_posix.cc
+++ b/base/platform_file_posix.cc
@@ -21,8 +21,7 @@
namespace base {
-#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_MACOSX)
typedef struct stat stat_wrapper_t;
static int CallFstat(int fd, stat_wrapper_t *sb) {
base::ThreadRestrictions::AssertIOAllowed();