From b6c3f06b538413701a76087036ddb775fa7126da Mon Sep 17 00:00:00 2001
From: Benjamin Jemlich <pcgod@users.sourceforge.net>
Date: Wed, 24 Aug 2011 16:13:57 +0200
Subject: [PATCH] Fix compile errors with g++
---
silk/silk_main.h | 10 ----------
silk/silk_tables_NLSF_CB_NB_MB.c | 2 +-
silk/silk_tables_NLSF_CB_WB.c | 2 +-
3 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/silk/silk_main.h b/silk/silk_main.h
index aec34e51b..d87897cb1 100644
--- a/silk/silk_main.h
+++ b/silk/silk_main.h
@@ -28,11 +28,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef SILK_MAIN_H
#define SILK_MAIN_H
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
#include "silk_SigProc_FIX.h"
#include "silk_define.h"
#include "silk_structs.h"
@@ -43,7 +38,6 @@ extern "C"
#include "entenc.h"
#include "entdec.h"
-
/* Uncomment the next line to store intermadiate data to files */
/*#define SAVE_ALL_INTERNAL_DATA 1*/
/* Uncomment the next line to force a fixed internal sampling rate (independent of what bitrate is used */
@@ -451,8 +445,4 @@ void silk_encode_indices(
opus_int encode_LBRR /* I Flag indicating LBRR data is being encoded */
);
-#ifdef __cplusplus
-}
-#endif
-
#endif
diff --git a/silk/silk_tables_NLSF_CB_NB_MB.c b/silk/silk_tables_NLSF_CB_NB_MB.c
index cfeac705d..d33a169a5 100644
--- a/silk/silk_tables_NLSF_CB_NB_MB.c
+++ b/silk/silk_tables_NLSF_CB_NB_MB.c
@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "config.h"
#endif
-#include "silk_structs.h"
+#include "silk_tables.h"
const opus_uint8 silk_NLSF_CB1_NB_MB_Q8[ 320 ] = {
12, 35, 60, 83, 108, 132, 157, 180,
diff --git a/silk/silk_tables_NLSF_CB_WB.c b/silk/silk_tables_NLSF_CB_WB.c
index 68c394069..e6f7bfd1b 100644
--- a/silk/silk_tables_NLSF_CB_WB.c
+++ b/silk/silk_tables_NLSF_CB_WB.c
@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "config.h"
#endif
-#include "silk_structs.h"
+#include "silk_tables.h"
const opus_uint8 silk_NLSF_CB1_WB_Q8[ 512 ] = {
7, 23, 38, 54, 69, 85, 100, 116,
--
GitLab