From 65a324ed34574b9319751044663abe235faaa0e2 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Tue, 8 Jul 2014 22:06:56 +0000 Subject: [PATCH] remove extern "C" from rotate function, since its built with extern "C" around full file. BUG=341 TESTED=clang -c -Iinclude source/rotate.c R=harryjin@google.com Review URL: https://webrtc-codereview.appspot.com/17919004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1031 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/rotate.cc | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.chromium b/README.chromium index 66a4aff8a..8a45a3ff9 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1030 +Version: 1031 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 06e07c03f..578e486bc 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 1030 +#define LIBYUV_VERSION 1031 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/rotate.cc b/source/rotate.cc index b052ac1dc..2ef3228cb 100644 --- a/source/rotate.cc +++ b/source/rotate.cc @@ -388,10 +388,10 @@ static void TransposeWx8_SSSE3(const uint8* src, int src_stride, #if !defined(LIBYUV_DISABLE_X86) && defined(__i386__) #define HAS_TRANSPOSE_UVWX8_SSE2 -extern "C" void TransposeUVWx8_SSE2(const uint8* src, int src_stride, - uint8* dst_a, int dst_stride_a, - uint8* dst_b, int dst_stride_b, - int w); +void TransposeUVWx8_SSE2(const uint8* src, int src_stride, + uint8* dst_a, int dst_stride_a, + uint8* dst_b, int dst_stride_b, + int w); asm ( DECLARE_FUNCTION(TransposeUVWx8_SSE2) "push %ebx \n"