diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-03-17 23:42:52 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-03-17 23:42:52 +0000 |
| commit | e292ba0099ecff2e3e31fcb6cac28ac8e243c43d (patch) | |
| tree | 1b74950e1b5750f688522886a8b73c01e56a18c5 /www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc | |
| parent | games/openra: update GeoLite2 to March snapshot (diff) | |
www/chromium: update to 57.0.2987.110
MFH: 2017Q1
Security: https://vuxml.freebsd.org/freebsd/a505d397-0758-11e7-8d8b-e8e0b747a45a.html
Diffstat (limited to 'www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc')
| -rw-r--r-- | www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc b/www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc deleted file mode 100644 index 5c7d481d662d..000000000000 --- a/www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc +++ /dev/null @@ -1,40 +0,0 @@ ---- third_party/webrtc/base/systeminfo.cc.orig 2017-01-26 00:50:17 UTC -+++ third_party/webrtc/base/systeminfo.cc -@@ -20,8 +20,12 @@ - #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) - #include <ApplicationServices/ApplicationServices.h> - #include <CoreServices/CoreServices.h> --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) - #include <unistd.h> -+#if defined(WEBRTC_BSD) -+#include <sys/types.h> -+#include <sys/sysctl.h> -+#endif - #endif - #if defined(WEBRTC_MAC) - #include <sys/sysctl.h> -@@ -66,7 +70,7 @@ static int DetectNumberOfCores() { - SYSTEM_INFO si; - GetSystemInfo(&si); - number_of_cores = static_cast<int>(si.dwNumberOfProcessors); --#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID) -+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID) || defined(WEBRTC_BSD) - number_of_cores = static_cast<int>(sysconf(_SC_NPROCESSORS_ONLN)); - #elif defined(WEBRTC_MAC) - int name[] = {CTL_HW, HW_AVAILCPU}; -@@ -174,9 +178,13 @@ int64_t SystemInfo::GetMemorySize() { - LOG_GLE(LS_WARNING) << "GlobalMemoryStatusEx failed."; - } - --#elif defined(WEBRTC_MAC) -+#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) - size_t len = sizeof(memory); -+ #if defined(WEBRTC_MAC) - int error = sysctlbyname("hw.memsize", &memory, &len, NULL, 0); -+ #else -+ int error = sysctlbyname("hw.physmem", &memory, &len, NULL, 0); -+ #endif - if (error || memory == 0) - memory = -1; - #elif defined(WEBRTC_LINUX) |