Commit 02ff4e77 authored by fbarchard@google.com's avatar fbarchard@google.com

clang compatibility ifdef

BUG=none
TEST=none
R=tpsiaki@google.com

Review URL: https://webrtc-codereview.appspot.com/7809004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@978 16f28f9a-4ce2-e073-06de-1de4eb20be90
parent 6916811e
Name: libyuv
URL: http://code.google.com/p/libyuv/
Version: 977
Version: 978
License: BSD
License File: LICENSE
......
......@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 977
#define LIBYUV_VERSION 978
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
......@@ -2024,7 +2024,7 @@ void I422ToUYVYRow_C(const uint8* src_y,
#if !defined(LIBYUV_DISABLE_X86) && defined(HAS_I422TOARGBROW_SSSE3)
// row_win.cc has asm version, but GCC uses 2 step wrapper.
#if defined(__x86_64__) || defined(__i386__)
#if !defined(_MSC_VER) && (defined(__x86_64__) || defined(__i386__))
void I422ToRGB565Row_SSSE3(const uint8* src_y,
const uint8* src_u,
const uint8* src_v,
......@@ -2036,7 +2036,7 @@ void I422ToRGB565Row_SSSE3(const uint8* src_y,
ARGBToRGB565Row_SSE2(row, rgb_buf, width);
free_aligned_buffer_64(row);
}
#endif // defined(__x86_64__) || defined(__i386__)
#endif // !defined(_MSC_VER) && (defined(__x86_64__) || defined(__i386__))
#if defined(_M_IX86) || defined(__x86_64__) || defined(__i386__)
void I422ToARGB1555Row_SSSE3(const uint8* src_y,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment