Commit da54de0c authored by James Zern's avatar James Zern Committed by Gerrit Code Review

Merge changes I57a94d2f,Ifb305185

* changes:
  test/: remove some unnecessary extern "C"s
  rtcd.sh: add extern "C" to generated headers
parents 7a197b2d f0619682
...@@ -209,6 +209,10 @@ common_top() { ...@@ -209,6 +209,10 @@ common_top() {
#define RTCD_EXTERN extern #define RTCD_EXTERN extern
#endif #endif
#ifdef __cplusplus
extern "C" {
#endif
$(process_forward_decls) $(process_forward_decls)
$(declare_function_pointers c $ALL_ARCHS) $(declare_function_pointers c $ALL_ARCHS)
...@@ -219,6 +223,11 @@ EOF ...@@ -219,6 +223,11 @@ EOF
common_bottom() { common_bottom() {
cat <<EOF cat <<EOF
#ifdef __cplusplus
} // extern "C"
#endif
#endif #endif
EOF EOF
} }
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#ifndef TEST_CODEC_FACTORY_H_ #ifndef TEST_CODEC_FACTORY_H_
#define TEST_CODEC_FACTORY_H_ #define TEST_CODEC_FACTORY_H_
extern "C" {
#include "./vpx_config.h" #include "./vpx_config.h"
#include "vpx/vpx_decoder.h" #include "vpx/vpx_decoder.h"
#include "vpx/vpx_encoder.h" #include "vpx/vpx_encoder.h"
...@@ -20,7 +19,6 @@ extern "C" { ...@@ -20,7 +19,6 @@ extern "C" {
#if CONFIG_VP8_DECODER || CONFIG_VP9_DECODER #if CONFIG_VP8_DECODER || CONFIG_VP9_DECODER
#include "vpx/vp8dx.h" #include "vpx/vp8dx.h"
#endif #endif
}
#include "test/decode_test_driver.h" #include "test/decode_test_driver.h"
#include "test/encode_test_driver.h" #include "test/encode_test_driver.h"
......
...@@ -14,9 +14,7 @@ ...@@ -14,9 +14,7 @@
#include "third_party/googletest/src/include/gtest/gtest.h" #include "third_party/googletest/src/include/gtest/gtest.h"
extern "C" {
#include "./vp9_rtcd.h" #include "./vp9_rtcd.h"
}
#include "test/acm_random.h" #include "test/acm_random.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
......
...@@ -8,10 +8,8 @@ ...@@ -8,10 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
extern "C" {
#include "./vpx_config.h" #include "./vpx_config.h"
#include "./vp8_rtcd.h" #include "./vp8_rtcd.h"
}
#include "test/clear_system_state.h" #include "test/clear_system_state.h"
#include "test/register_state_check.h" #include "test/register_state_check.h"
#include "third_party/googletest/src/include/gtest/gtest.h" #include "third_party/googletest/src/include/gtest/gtest.h"
......
...@@ -10,12 +10,10 @@ ...@@ -10,12 +10,10 @@
#include "test/clear_system_state.h" #include "test/clear_system_state.h"
#include "test/register_state_check.h" #include "test/register_state_check.h"
#include "third_party/googletest/src/include/gtest/gtest.h" #include "third_party/googletest/src/include/gtest/gtest.h"
extern "C" {
#include "./vpx_config.h" #include "./vpx_config.h"
#include "./vp8_rtcd.h" #include "./vp8_rtcd.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
}
typedef void (*post_proc_func_t)(unsigned char *src_ptr, typedef void (*post_proc_func_t)(unsigned char *src_ptr,
unsigned char *dst_ptr, unsigned char *dst_ptr,
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include <limits.h> #include <limits.h>
#include <stdio.h> #include <stdio.h>
extern "C" {
#include "./vpx_config.h" #include "./vpx_config.h"
#if CONFIG_VP8_ENCODER #if CONFIG_VP8_ENCODER
#include "./vp8_rtcd.h" #include "./vp8_rtcd.h"
...@@ -22,7 +21,6 @@ extern "C" { ...@@ -22,7 +21,6 @@ extern "C" {
#include "./vp9_rtcd.h" #include "./vp9_rtcd.h"
#endif #endif
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
}
#include "test/acm_random.h" #include "test/acm_random.h"
#include "test/clear_system_state.h" #include "test/clear_system_state.h"
......
...@@ -16,12 +16,10 @@ ...@@ -16,12 +16,10 @@
#include "test/register_state_check.h" #include "test/register_state_check.h"
#include "test/util.h" #include "test/util.h"
#include "third_party/googletest/src/include/gtest/gtest.h" #include "third_party/googletest/src/include/gtest/gtest.h"
extern "C" {
#include "./vpx_config.h" #include "./vpx_config.h"
#include "./vp8_rtcd.h" #include "./vp8_rtcd.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
}
namespace { namespace {
......
...@@ -19,9 +19,7 @@ ...@@ -19,9 +19,7 @@
#include "test/test_vectors.h" #include "test/test_vectors.h"
#include "test/util.h" #include "test/util.h"
#include "test/webm_video_source.h" #include "test/webm_video_source.h"
extern "C" {
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
}
namespace { namespace {
......
...@@ -17,9 +17,7 @@ ...@@ -17,9 +17,7 @@
#include "test/i420_video_source.h" #include "test/i420_video_source.h"
#include "test/util.h" #include "test/util.h"
#include "test/md5_helper.h" #include "test/md5_helper.h"
extern "C" {
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
}
namespace { namespace {
class TileIndependenceTest : public ::libvpx_test::EncoderTest, class TileIndependenceTest : public ::libvpx_test::EncoderTest,
......
...@@ -15,9 +15,7 @@ ...@@ -15,9 +15,7 @@
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
extern "C" {
#include "./vp8_rtcd.h" #include "./vp8_rtcd.h"
}
#include "test/acm_random.h" #include "test/acm_random.h"
#include "third_party/googletest/src/include/gtest/gtest.h" #include "third_party/googletest/src/include/gtest/gtest.h"
......
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