From a2c3463ac285c1d09b2759857e6315d566e03034 Mon Sep 17 00:00:00 2001 From: drowe67 Date: Mon, 15 Oct 2012 22:40:03 +0000 Subject: [PATCH] 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 --- codec2-dev/src/fifo.h | 8 ++++++++ codec2-dev/src/phaseexp.c | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/codec2-dev/src/fifo.h b/codec2-dev/src/fifo.h index d8fbcf74..e9bf2418 100644 --- 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 2cd88b0e..57db0f09 100644 --- 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 #include -- 2.25.1