From ec7f2133d0fa123eeb0ca1d7c75ac473aec5ed1f Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Sat, 18 Jan 2014 12:16:11 -0800
Subject: [PATCH] vpx: add extern "C" to headers
Change-Id: Ide9a68466ed30453872465a6c2f9c414690df876
---
vpx/internal/vpx_codec_internal.h | 8 ++++++++
vpx/vpx_image.h | 11 ++++++-----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/vpx/internal/vpx_codec_internal.h b/vpx/internal/vpx_codec_internal.h
index 6c644f045e..9f9da5c289 100644
--- a/vpx/internal/vpx_codec_internal.h
+++ b/vpx/internal/vpx_codec_internal.h
@@ -47,6 +47,9 @@
#include "../vpx_encoder.h"
#include <stdarg.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
/*!\brief Current ABI version number
*
@@ -476,6 +479,7 @@ vpx_codec_pkt_list_get(struct vpx_codec_pkt_list *list,
#include <stdio.h>
#include <setjmp.h>
+
struct vpx_internal_error_info {
vpx_codec_err_t error_code;
int has_detail;
@@ -532,4 +536,8 @@ vpx_codec_err_t vpx_validate_mmaps(const vpx_codec_stream_info_t *si,
const vpx_codec_mmap_t *mmaps,
const mem_req_t *mem_reqs, int nreqs,
vpx_codec_flags_t init_flags);
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
#endif // VPX_INTERNAL_VPX_CODEC_INTERNAL_H_
diff --git a/vpx/vpx_image.h b/vpx/vpx_image.h
index 79e11aa010..d27325cad7 100644
--- a/vpx/vpx_image.h
+++ b/vpx/vpx_image.h
@@ -13,13 +13,13 @@
* \brief Describes the vpx image descriptor and associated operations
*
*/
+#ifndef VPX_VPX_IMAGE_H_
+#define VPX_VPX_IMAGE_H_
+
#ifdef __cplusplus
extern "C" {
#endif
-#ifndef VPX_VPX_IMAGE_H_
-#define VPX_VPX_IMAGE_H_
-
/*!\brief Current ABI version number
*
* \internal
@@ -237,7 +237,8 @@ extern "C" {
*/
void vpx_img_free(vpx_image_t *img);
-#endif
#ifdef __cplusplus
-}
+} // extern "C"
+#endif
+
#endif // VPX_VPX_IMAGE_H_
--
GitLab