From 64455db9b100ad09f17d6d31ad4f899584d5997d Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Fri, 15 Aug 2014 01:23:54 +0000 Subject: [PATCH] cpuid include intrinsics header before using xgetbv BUG=282 TESTED=vs2010sp1 build. R=tpsiaki@google.com Review URL: https://webrtc-codereview.appspot.com/17109004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1046 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/cpu_id.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.chromium b/README.chromium index b88a3e2ea..94c80964c 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1045 +Version: 1046 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 82f402a96..dcb9f708d 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1045 +#define LIBYUV_VERSION 1046 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/cpu_id.cc b/source/cpu_id.cc index c88a251e6..cbec8026b 100644 --- a/source/cpu_id.cc +++ b/source/cpu_id.cc @@ -14,7 +14,7 @@ #include // For __cpuidex() #endif #if !defined(__pnacl__) && !defined(__CLR_VER) && \ - !defined(__native_client__) && defined(_M_X64) && \ + !defined(__native_client__) && \ defined(_MSC_VER) && (_MSC_FULL_VER >= 160040219) #include // For _xgetbv() #endif