From 58f0020137cd2a2c4a12387d1f6bdb862de43669 Mon Sep 17 00:00:00 2001
From: Frank Barchard <fbarchard@google.com>
Date: Tue, 11 Aug 2015 10:10:45 -0700
Subject: [PATCH] use visual c 32 bit code for clangcl

R=harryjin@google.com
BUG=libyuv:483

Review URL: https://webrtc-codereview.appspot.com/54819004.
---
 README.chromium             | 2 +-
 include/libyuv/rotate_row.h | 5 ++---
 include/libyuv/version.h    | 2 +-
 source/rotate_gcc.cc        | 3 ++-
 source/rotate_win.cc        | 5 ++---
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/README.chromium b/README.chromium
index 19648225b..6df39a4c1 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 1462
+Version: 1463
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/rotate_row.h b/include/libyuv/rotate_row.h
index d3c12dfd8..37ebc7401 100644
--- a/include/libyuv/rotate_row.h
+++ b/include/libyuv/rotate_row.h
@@ -29,9 +29,8 @@ extern "C" {
 #define VISUALC_HAS_AVX2 1
 #endif  // VisualStudio >= 2012
 
-// The following are available for Visual C:
-#if !defined(LIBYUV_DISABLE_X86) && defined(_M_IX86) && \
-    defined(_MSC_VER) && !defined(__clang__)
+// The following are available for Visual C and clangcl 32 bit:
+#if !defined(LIBYUV_DISABLE_X86) && defined(_M_IX86)
 #define HAS_TRANSPOSEWX8_SSSE3
 #define HAS_TRANSPOSEUVWX8_SSE2
 #endif
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 5e4c3905a..0bab6d2e3 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 1462
+#define LIBYUV_VERSION 1463
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/source/rotate_gcc.cc b/source/rotate_gcc.cc
index 72b17f3ef..cbe870caa 100644
--- a/source/rotate_gcc.cc
+++ b/source/rotate_gcc.cc
@@ -17,7 +17,8 @@ extern "C" {
 #endif
 
 // This module is for GCC x86 and x64.
-#if !defined(LIBYUV_DISABLE_X86) && (defined(__x86_64__) || defined(__i386__))
+#if !defined(LIBYUV_DISABLE_X86) && \
+    (defined(__x86_64__) || (defined(__i386__) && !defined(_MSC_VER)))
 
 // Transpose 8x8. 32 or 64 bit, but not NaCL for 64 bit.
 #if defined(HAS_TRANSPOSEWX8_SSSE3)
diff --git a/source/rotate_win.cc b/source/rotate_win.cc
index 2760066df..1300fc0fe 100644
--- a/source/rotate_win.cc
+++ b/source/rotate_win.cc
@@ -16,9 +16,8 @@ namespace libyuv {
 extern "C" {
 #endif
 
-// This module is for Visual C x86.
-#if !defined(LIBYUV_DISABLE_X86) && defined(_M_IX86) && \
-    defined(_MSC_VER) && !defined(__clang__)
+// This module is for 32 bit Visual C x86 and clangcl
+#if !defined(LIBYUV_DISABLE_X86) && defined(_M_IX86)
 
 __declspec(naked)
 void TransposeWx8_SSSE3(const uint8* src, int src_stride,