C++ linkage for fifo.h and removed spurios include from phasexp.c

git-svn-id: https://svn.code.sf.net/p/freetel/code@758 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/codec2-dev/src/fifo.h b/codec2-dev/src/fifo.h
index d8fbcf74cc4594682841cdbfed6d33a1a93164d1..e9bf2418b8436734c27ea374a17bf4059fbf6033 100644 (file)
--- a/codec2-dev/src/fifo.h
+++ b/codec2-dev/src/fifo.h
@@ -29,6 +29,10 @@
 #ifndef __FIFO__
 #define __FIFO__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct FIFO;
 
 struct FIFO *fifo_create(int nshort);
@@ -37,4 +41,8 @@ int fifo_write(struct FIFO *fifo, short data[], int n);
 int fifo_read(struct FIFO *fifo, short data[], int n);
 int fifo_n(struct FIFO *fifo);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

diff --git a/codec2-dev/src/phaseexp.c b/codec2-dev/src/phaseexp.c
index 2cd88b0e0007f36273605ce0d6bb1836e4623406..57db0f0919a520867193face8e6ab29e39c5d763 100644 (file)
--- a/codec2-dev/src/phaseexp.c
+++ b/codec2-dev/src/phaseexp.c
@@ -29,7 +29,6 @@
 #include "phase.h"
 #include "kiss_fft.h"
 #include "comp.h"
-#include "glottal.c"
 
 #include <assert.h>
 #include <ctype.h>