aboutsummaryrefslogtreecommitdiff
path: root/third_party
diff options
context:
space:
mode:
authorBob Beck <beck@openbsd.org>2023-03-08 12:40:29 -0700
committerBoringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-05-11 16:37:32 +0000
commit4540c3caf0b1d950c8025ccbb194e46f2c6a7f65 (patch)
tree3c2caf9ea5a9cf37d158582dadbe6f0e8f9d9b52 /third_party
parentc6dd304d2c628277b710ab50ce9eed660696756d (diff)
downloadboringssl-4540c3caf0b1d950c8025ccbb194e46f2c6a7f65.zip
boringssl-4540c3caf0b1d950c8025ccbb194e46f2c6a7f65.tar.gz
boringssl-4540c3caf0b1d950c8025ccbb194e46f2c6a7f65.tar.bz2
OpenBSD Support
Includes bits by me and Robert Nagy <robert.nagy@gmail.com> who has a google CLA. Update-Note: Additionally, BoringSSL now requires macOS 10.12 or later for getentropy support. This is consistent with https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md WANT_LGTM=all Change-Id: I5ab74fa8a6677fac29c316aa29a954df401ba647 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/59225 Commit-Queue: Bob Beck <bbe@google.com> Reviewed-by: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'third_party')
-rw-r--r--third_party/googletest/METADATA1
-rw-r--r--third_party/googletest/src/gtest-port.cc4
2 files changed, 3 insertions, 2 deletions
diff --git a/third_party/googletest/METADATA b/third_party/googletest/METADATA
index 5674bcc..c5156cf 100644
--- a/third_party/googletest/METADATA
+++ b/third_party/googletest/METADATA
@@ -12,4 +12,5 @@ third_party {
local_modifications:
"Only googletest, not googlemock, is included."
"Applied https://github.com/google/googletest/pull/3206."
+ "Applied cl/529512111"
}
diff --git a/third_party/googletest/src/gtest-port.cc b/third_party/googletest/src/gtest-port.cc
index 3f39f71..fcac44c 100644
--- a/third_party/googletest/src/gtest-port.cc
+++ b/third_party/googletest/src/gtest-port.cc
@@ -202,8 +202,8 @@ size_t GetThreadCount() {
mib[5] = static_cast<int>(size / static_cast<size_t>(mib[4]));
// populate array of structs
- struct kinfo_proc info[mib[5]];
- if (sysctl(mib, miblen, &info, &size, NULL, 0)) {
+ std::vector<struct kinfo_proc> info(mib[5]);
+ if (sysctl(mib, miblen, info.data(), &size, NULL, 0)) {
return 0;
}