summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLuboš Doležel <lubos@dolezel.info>2016-07-20 16:07:50 +0200
committerGitHub <noreply@github.com>2016-07-20 16:07:50 +0200
commita1ae5e1863dfad1fe2da9cdf3cfe86e76fbfa92b (patch)
treed4046cfb1d016ed2beadbe388519e7789a1e42ff /src
parent4a94b244b7b8572fe3e38e690162dc4ed5aaeb31 (diff)
parent833bc7705377a34058decbbfe4d9df10f6b793bb (diff)
downloadtwinkle-a1ae5e1863dfad1fe2da9cdf3cfe86e76fbfa92b.tar
twinkle-a1ae5e1863dfad1fe2da9cdf3cfe86e76fbfa92b.tar.gz
twinkle-a1ae5e1863dfad1fe2da9cdf3cfe86e76fbfa92b.tar.lz
twinkle-a1ae5e1863dfad1fe2da9cdf3cfe86e76fbfa92b.tar.xz
twinkle-a1ae5e1863dfad1fe2da9cdf3cfe86e76fbfa92b.zip
Merge pull request #70 from manisandro/gsm_extern_c
Enclose gsm.h includes with extern C to resolve link failures
Diffstat (limited to 'src')
-rw-r--r--src/audio/audio_decoder.h2
-rw-r--r--src/audio/audio_encoder.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/audio/audio_decoder.h b/src/audio/audio_decoder.h
index 48ef29c..25d895c 100644
--- a/src/audio/audio_decoder.h
+++ b/src/audio/audio_decoder.h
@@ -26,7 +26,9 @@
#include "user.h"
#ifdef HAVE_GSM
+extern "C" {
#include <gsm/gsm.h>
+}
#else
#include "gsm/inc/gsm.h"
#endif
diff --git a/src/audio/audio_encoder.h b/src/audio/audio_encoder.h
index b900414..907283f 100644
--- a/src/audio/audio_encoder.h
+++ b/src/audio/audio_encoder.h
@@ -26,7 +26,9 @@
#include "user.h"
#ifdef HAVE_GSM
+extern "C" {
#include <gsm/gsm.h>
+}
#else
#include "gsm/inc/gsm.h"
#endif