From 9ffb92fae0d1c82c1fe6808c7c33b1a76bea41f7 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Wed, 9 Jul 2014 17:55:23 +0000 Subject: [PATCH] Detect clang-cl compiler and disable assembly for now. BUG=341 TESTED=clang-cl /W0 -c -Iinclude source/cpu_id.c R=harryjin@google.com, rnk@chromium.org Review URL: https://webrtc-codereview.appspot.com/12939004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1033 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/row.h | 3 ++- include/libyuv/version.h | 2 +- include/libyuv/video_common.h | 2 +- source/cpu_id.cc | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.chromium b/README.chromium index 8a45a3ff9..ad2c87647 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1031 +Version: 1032 License: BSD License File: LICENSE diff --git a/include/libyuv/row.h b/include/libyuv/row.h index e99c44100..cdf6cecb0 100644 --- a/include/libyuv/row.h +++ b/include/libyuv/row.h @@ -42,7 +42,8 @@ extern "C" { var = 0 #if defined(__pnacl__) || defined(__CLR_VER) || defined(COVERAGE_ENABLED) || \ - defined(TARGET_IPHONE_SIMULATOR) + defined(TARGET_IPHONE_SIMULATOR) || \ + (defined(_MSC_VER) && defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // True if compiling for SSSE3 as a requirement. diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 578e486bc..1417d84cc 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 1031 +#define LIBYUV_VERSION 1032 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/include/libyuv/video_common.h b/include/libyuv/video_common.h index 039efb96d..91acc2ffc 100644 --- a/include/libyuv/video_common.h +++ b/include/libyuv/video_common.h @@ -115,7 +115,7 @@ enum FourCC { FOURCC_H264 = FOURCC('H', '2', '6', '4'), // Match any fourcc. - FOURCC_ANY = 0xFFFFFFFF, + FOURCC_ANY = -1, }; enum FourCCBpp { diff --git a/source/cpu_id.cc b/source/cpu_id.cc index fdf4d0901..41880e504 100644 --- a/source/cpu_id.cc +++ b/source/cpu_id.cc @@ -10,7 +10,7 @@ #include "libyuv/cpu_id.h" -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(__clang__) #include // For __cpuidex() #endif #if !defined(__pnacl__) && !defined(__CLR_VER) && \ @@ -48,7 +48,7 @@ extern "C" { defined(__i386__) || defined(__x86_64__)) LIBYUV_API void CpuId(uint32 info_eax, uint32 info_ecx, uint32* cpu_info) { -#if defined(_MSC_VER) +#if defined(_MSC_VER) && !defined(__clang__) #if (_MSC_FULL_VER >= 160040219) __cpuidex((int*)(cpu_info), info_eax, info_ecx); #elif defined(_M_IX86)