diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | src/DatabaseGlue.cxx | 7 | ||||
| -rw-r--r-- | src/Main.cxx | 5 | ||||
| -rw-r--r-- | src/OtherCommands.cxx | 6 | ||||
| -rw-r--r-- | src/Stats.cxx | 6 | ||||
| -rw-r--r-- | src/Stats.hxx (renamed from src/stats.h) | 6 | ||||
| -rw-r--r-- | src/UpdateGlue.cxx | 6 |
7 files changed, 10 insertions, 29 deletions
diff --git a/Makefile.am b/Makefile.am index 4afe48dd8..e3cfd9d89 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,7 +65,6 @@ mpd_headers = \ src/replay_gain_config.h \ src/replay_gain_info.h \ src/TimePrint.cxx src/TimePrint.hxx \ - src/stats.h \ src/Timer.hxx src_mpd_SOURCES = \ @@ -202,7 +201,7 @@ src_mpd_SOURCES = \ src/SongSave.cxx src/SongSave.hxx \ src/SongSort.cxx src/SongSort.hxx \ src/StateFile.cxx src/StateFile.hxx \ - src/Stats.cxx \ + src/Stats.cxx src/Stats.hxx \ src/TagPrint.cxx src/TagPrint.hxx \ src/TagSave.cxx src/TagSave.hxx \ src/TagFile.cxx src/TagFile.hxx \ diff --git a/src/DatabaseGlue.cxx b/src/DatabaseGlue.cxx index 10d936eac..d47108f71 100644 --- a/src/DatabaseGlue.cxx +++ b/src/DatabaseGlue.cxx @@ -26,11 +26,7 @@ #include "Directory.hxx" #include "util/Error.hxx" #include "ConfigData.hxx" - -extern "C" { -#include "stats.h" -} - +#include "Stats.hxx" #include "DatabasePlugin.hxx" #include "db/SimpleDatabasePlugin.hxx" @@ -43,6 +39,7 @@ extern "C" { #include <string.h> #include <errno.h> + static Database *db; static bool db_is_open; static bool is_simple; diff --git a/src/Main.cxx b/src/Main.cxx index 360204155..6857970cf 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -62,10 +62,7 @@ #include "ConfigData.hxx" #include "ConfigDefaults.hxx" #include "ConfigOption.hxx" - -extern "C" { -#include "stats.h" -} +#include "Stats.hxx" #ifdef ENABLE_INOTIFY #include "InotifyUpdate.hxx" diff --git a/src/OtherCommands.cxx b/src/OtherCommands.cxx index 04ccf6d54..e22c8d093 100644 --- a/src/OtherCommands.cxx +++ b/src/OtherCommands.cxx @@ -36,11 +36,7 @@ #include "util/UriUtil.hxx" #include "util/Error.hxx" #include "fs/Path.hxx" - -extern "C" { -#include "stats.h" -} - +#include "Stats.hxx" #include "Permission.hxx" #include "PlaylistFile.hxx" #include "ClientFile.hxx" diff --git a/src/Stats.cxx b/src/Stats.cxx index de7091ddc..6de3714fb 100644 --- a/src/Stats.cxx +++ b/src/Stats.cxx @@ -18,11 +18,7 @@ */ #include "config.h" - -extern "C" { -#include "stats.h" -} - +#include "Stats.hxx" #include "PlayerControl.hxx" #include "ClientInternal.hxx" #include "DatabaseSelection.hxx" diff --git a/src/stats.h b/src/Stats.hxx index eb723bcf3..384179242 100644 --- a/src/stats.h +++ b/src/Stats.hxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2011 The Music Player Daemon Project + * Copyright (C) 2003-2013 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MPD_STATS_H -#define MPD_STATS_H +#ifndef MPD_STATS_HXX +#define MPD_STATS_HXX #include <glib.h> diff --git a/src/UpdateGlue.cxx b/src/UpdateGlue.cxx index a4a47d468..50af6271d 100644 --- a/src/UpdateGlue.cxx +++ b/src/UpdateGlue.cxx @@ -29,11 +29,7 @@ #include "GlobalEvents.hxx" #include "util/Error.hxx" #include "Log.hxx" - -extern "C" { -#include "stats.h" -} - +#include "Stats.hxx" #include "Main.hxx" #include "Instance.hxx" #include "system/FatalError.hxx" |