Revert "Fuchsia: Stop setting OS_POSIX"
This reverts commit 90f86c118d322a2ad437157a71cef8fc43a17d01.
Reason for revert: Broke builders
https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Fuchsia%20ARM64%20Cast%20Audio/14741
https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Fuchsia%20x64%20Cast%20Audio/14712
Original change's description:
> Fuchsia: Stop setting OS_POSIX
>
> Bug: 836416
> Change-Id: Ib59796358ff2109ec0b55686974a84980e18254e
> Reviewed-on: https://chromium-review.googlesource.com/1020375
> Reviewed-by: Kinuko Yasuda <[email protected]>
> Reviewed-by: Nico Weber <[email protected]>
> Reviewed-by: Scott Graham <[email protected]>
> Reviewed-by: Matt Mueller <[email protected]>
> Reviewed-by: Victor Costan <[email protected]>
> Commit-Queue: Fabrice de Gans-Riberi <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#560013}
[email protected],[email protected],[email protected],[email protected],[email protected],[email protected]
Change-Id: I6f8a28690dddefe8acf99220646def362bdc9bc8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 836416
Reviewed-on: https://chromium-review.googlesource.com/1066332
Reviewed-by: Fabrice de Gans-Riberi <[email protected]>
Commit-Queue: Fabrice de Gans-Riberi <[email protected]>
Cr-Commit-Position: refs/heads/master@{#560031}diff --git a/sql/connection.cc b/sql/connection.cc
index 877ffb5..4fd3d41 100644
--- a/sql/connection.cc
+++ b/sql/connection.cc
@@ -168,7 +168,7 @@
std::string AsUTF8ForSQL(const base::FilePath& path) {
#if defined(OS_WIN)
return base::WideToUTF8(path.value());
-#elif defined(OS_POSIX) || defined(OS_FUCHSIA)
+#elif defined(OS_POSIX)
return path.value();
#endif
}
@@ -542,7 +542,7 @@
const base::StringPiece db_path(path);
#if defined(OS_WIN)
return base::FilePath(base::UTF8ToWide(db_path));
-#elif defined(OS_POSIX) || defined(OS_FUCHSIA)
+#elif defined(OS_POSIX)
return base::FilePath(db_path);
#else
NOTREACHED();
@@ -676,7 +676,7 @@
// from posix.
#if defined(OS_WIN)
base::StringAppendF(&debug_info, "LastError: %d\n", GetLastErrno());
-#elif defined(OS_POSIX) || defined(OS_FUCHSIA)
+#elif defined(OS_POSIX)
base::StringAppendF(&debug_info, "errno: %d\n", GetLastErrno());
#else
NOTREACHED(); // Add appropriate log info.
@@ -1284,10 +1284,8 @@
Statement s(GetUniqueStatement("ATTACH DATABASE ? AS ?"));
#if OS_WIN
s.BindString16(0, other_db_path.value());
-#elif defined(OS_POSIX) || defined(OS_FUCHSIA)
- s.BindString(0, other_db_path.value());
#else
-#error Unsupported platform
+ s.BindString(0, other_db_path.value());
#endif
s.BindString(1, attachment_point);
return s.Run();
@@ -1653,7 +1651,7 @@
}
// TODO(shess): OS_WIN support?
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) && !defined(OS_FUCHSIA)
if (restrict_to_user_) {
DCHECK_NE(file_name, std::string(":memory"));
base::FilePath file_path(file_name);
@@ -1674,7 +1672,7 @@
base::SetPosixFilePermissions(wal_path, mode);
}
}
-#endif // defined(OS_POSIX)
+#endif // defined(OS_POSIX) && !defined(OS_FUCHSIA)
// SQLite uses a lookaside buffer to improve performance of small mallocs.
// Chromium already depends on small mallocs being efficient, so we disable
