From 6e95f6f7e1270163832459cb54079e2e03d66238 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Thu, 21 Aug 2014 22:44:49 +0000 Subject: [PATCH] ifdef headers to avoid intrinsics if built with gcc 64 bit on windows. BUG=351 TESTED=untested R=jzern@chromium.org Review URL: https://webrtc-codereview.appspot.com/22419004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1058 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/row_win.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.chromium b/README.chromium index d78a97afc..67a99937c 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1057 +Version: 1058 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 5366ac386..21124f6d7 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 1057 +#define LIBYUV_VERSION 1058 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/row_win.cc b/source/row_win.cc index 4c69f8159..f58fc5138 100644 --- a/source/row_win.cc +++ b/source/row_win.cc @@ -10,7 +10,7 @@ #include "libyuv/row.h" -#if defined (_M_X64) +#if defined (_M_X64) && !defined(LIBYUV_DISABLE_X86) && defined(_MSC_VER) #include #include // For _mm_maddubs_epi16 #endif