aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-01-15 01:01:25 +0100
committerMax Kellermann <max@duempel.org>2013-01-15 01:01:25 +0100
commit76bc28ab1e4ce17926905cbdae455cee8e275a1d (patch)
tree76b2b839842f95ff6961985c8dacf0fa3b5cb0b1
parentf47f86ef020074728d30e9602f5fceec02315a88 (diff)
downloadmpd-76bc28ab1e4ce17926905cbdae455cee8e275a1d.tar.gz
mpd-76bc28ab1e4ce17926905cbdae455cee8e275a1d.tar.xz
mpd-76bc28ab1e4ce17926905cbdae455cee8e275a1d.zip
fifo_buffer: add extern "C"
-rw-r--r--src/ClientNew.cxx2
-rw-r--r--src/ClientRead.cxx3
-rw-r--r--src/InotifySource.cxx4
-rw-r--r--src/fifo_buffer.h8
4 files changed, 9 insertions, 8 deletions
diff --git a/src/ClientNew.cxx b/src/ClientNew.cxx
index a95c77fde..6ece4d5c9 100644
--- a/src/ClientNew.cxx
+++ b/src/ClientNew.cxx
@@ -22,8 +22,8 @@
#include "ClientList.hxx"
#include "Partition.hxx"
#include "fd_util.h"
-extern "C" {
#include "fifo_buffer.h"
+extern "C" {
#include "resolver.h"
}
#include "Permission.hxx"
diff --git a/src/ClientRead.cxx b/src/ClientRead.cxx
index aab4cae33..e84f6622d 100644
--- a/src/ClientRead.cxx
+++ b/src/ClientRead.cxx
@@ -19,10 +19,7 @@
#include "config.h"
#include "ClientInternal.hxx"
-
-extern "C" {
#include "fifo_buffer.h"
-}
#include <assert.h>
#include <string.h>
diff --git a/src/InotifySource.cxx b/src/InotifySource.cxx
index f795733d8..5f6239585 100644
--- a/src/InotifySource.cxx
+++ b/src/InotifySource.cxx
@@ -19,11 +19,7 @@
#include "config.h"
#include "InotifySource.hxx"
-
-extern "C" {
#include "fifo_buffer.h"
-}
-
#include "fd_util.h"
#include "mpd_error.h"
diff --git a/src/fifo_buffer.h b/src/fifo_buffer.h
index 3bdb23938..49c7f4992 100644
--- a/src/fifo_buffer.h
+++ b/src/fifo_buffer.h
@@ -46,6 +46,10 @@
struct fifo_buffer;
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/**
* Creates a new #fifo_buffer object. Free this object with
* fifo_buffer_free().
@@ -150,4 +154,8 @@ fifo_buffer_is_empty(struct fifo_buffer *buffer);
bool
fifo_buffer_is_full(struct fifo_buffer *buffer);
+#ifdef __cplusplus
+}
+#endif
+
#endif