From 975370c084c8d679ff2cc2fcee48326b1dbcbf2e Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 7 Jan 2013 09:38:02 +0100
Subject: decoder_api.h, ...: add "extern C"

---
 test/DumpDatabase.cxx  | 3 ---
 test/dump_playlist.cxx | 6 +++---
 test/run_input.cxx     | 6 +++---
 test/run_output.cxx    | 2 +-
 4 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'test')

diff --git a/test/DumpDatabase.cxx b/test/DumpDatabase.cxx
index 0678d707..ea0ebb44 100644
--- a/test/DumpDatabase.cxx
+++ b/test/DumpDatabase.cxx
@@ -24,11 +24,8 @@
 #include "Directory.hxx"
 #include "song.h"
 #include "PlaylistVector.hxx"
-
-extern "C" {
 #include "conf.h"
 #include "tag.h"
-}
 
 #include <iostream>
 using std::cout;
diff --git a/test/dump_playlist.cxx b/test/dump_playlist.cxx
index 7d4aa96e..ee54c465 100644
--- a/test/dump_playlist.cxx
+++ b/test/dump_playlist.cxx
@@ -21,13 +21,13 @@
 #include "TagSave.hxx"
 #include "song.h"
 #include "Directory.hxx"
+#include "input_stream.h"
+#include "conf.h"
+#include "decoder_api.h"
 
 extern "C" {
 #include "io_thread.h"
 #include "input_init.h"
-#include "input_stream.h"
-#include "conf.h"
-#include "decoder_api.h"
 #include "decoder_list.h"
 #include "playlist_list.h"
 #include "playlist_plugin.h"
diff --git a/test/run_input.cxx b/test/run_input.cxx
index 52b53db5..2df5e69f 100644
--- a/test/run_input.cxx
+++ b/test/run_input.cxx
@@ -20,13 +20,13 @@
 #include "config.h"
 #include "TagSave.hxx"
 #include "stdbin.h"
+#include "tag.h"
+#include "conf.h"
+#include "input_stream.h"
 
 extern "C" {
 #include "io_thread.h"
 #include "input_init.h"
-#include "input_stream.h"
-#include "tag.h"
-#include "conf.h"
 
 #ifdef ENABLE_ARCHIVE
 #include "archive_list.h"
diff --git a/test/run_output.cxx b/test/run_output.cxx
index 04374537..e46e61d4 100644
--- a/test/run_output.cxx
+++ b/test/run_output.cxx
@@ -19,12 +19,12 @@
 
 #include "config.h"
 #include "OutputControl.hxx"
+#include "conf.h"
 
 extern "C" {
 #include "output_plugin.h"
 #include "output_internal.h"
 #include "io_thread.h"
-#include "conf.h"
 #include "audio_parser.h"
 #include "filter_registry.h"
 #include "pcm_convert.h"
-- 
cgit v1.2.3