Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: source/libvpx/vp8/common/generic/systemdependent.c

Issue 1302353004: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/libvpx/vp8/common/findnearmv.h ('k') | source/libvpx/vp8/common/invtrans.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/libvpx/vp8/common/generic/systemdependent.c
diff --git a/source/libvpx/vp8/common/generic/systemdependent.c b/source/libvpx/vp8/common/generic/systemdependent.c
index 4393ced48c80a3bb1648ede08916817908ff4d2d..28dc262ae5a2c1c935a213c3f2977de80b679892 100644
--- a/source/libvpx/vp8/common/generic/systemdependent.c
+++ b/source/libvpx/vp8/common/generic/systemdependent.c
@@ -45,6 +45,10 @@ static int get_cpu_count()
#endif
#elif defined(_WIN32)
{
+#if _WIN32_WINNT >= 0x0501
+ SYSTEM_INFO sysinfo;
+ GetNativeSystemInfo(&sysinfo);
+#else
PGNSI pGNSI;
SYSTEM_INFO sysinfo;
@@ -57,6 +61,7 @@ static int get_cpu_count()
pGNSI(&sysinfo);
else
GetSystemInfo(&sysinfo);
+#endif
core_count = sysinfo.dwNumberOfProcessors;
}
« no previous file with comments | « source/libvpx/vp8/common/findnearmv.h ('k') | source/libvpx/vp8/common/invtrans.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698