ref: b6c3f06b538413701a76087036ddb775fa7126da
parent: 3870ddb665f987c139c8ca6477a152868c1c6f6e
author: Benjamin Jemlich <[email protected]>
date: Wed Aug 24 12:13:57 EDT 2011
Fix compile errors with g++
--- a/silk/silk_main.h
+++ b/silk/silk_main.h
@@ -28,11 +28,6 @@
#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 @@
#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 */
@@ -450,9 +444,5 @@
opus_int FrameIndex, /* I Frame number */
opus_int encode_LBRR /* I Flag indicating LBRR data is being encoded */
);
-
-#ifdef __cplusplus
-}
-#endif
#endif
--- a/silk/silk_tables_NLSF_CB_NB_MB.c
+++ b/silk/silk_tables_NLSF_CB_NB_MB.c
@@ -29,7 +29,7 @@
#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,
--- a/silk/silk_tables_NLSF_CB_WB.c
+++ b/silk/silk_tables_NLSF_CB_WB.c
@@ -29,7 +29,7 @@
#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,