aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--src/AllCommands.cxx1
-rw-r--r--src/CommandError.cxx2
-rw-r--r--src/CommandError.hxx (renamed from src/CommandError.h)8
-rw-r--r--src/DatabaseCommands.cxx2
-rw-r--r--src/OtherCommands.cxx2
-rw-r--r--src/PlayerCommands.cxx2
-rw-r--r--src/PlaylistCommands.cxx2
-rw-r--r--src/QueueCommands.cxx2
9 files changed, 9 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am
index 02ea9a3b..23d2f4e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -234,7 +234,7 @@ src_mpd_SOURCES = \
src/audio_parser.c \
src/protocol/argparser.c src/protocol/argparser.h \
src/protocol/result.c src/protocol/result.h \
- src/CommandError.cxx src/CommandError.h \
+ src/CommandError.cxx src/CommandError.hxx \
src/AllCommands.cxx \
src/QueueCommands.cxx src/QueueCommands.hxx \
src/PlayerCommands.cxx src/PlayerCommands.hxx \
diff --git a/src/AllCommands.cxx b/src/AllCommands.cxx
index 762ae73d..003fcbe3 100644
--- a/src/AllCommands.cxx
+++ b/src/AllCommands.cxx
@@ -27,7 +27,6 @@
#include "StickerCommands.hxx"
#include "MessageCommands.hxx"
#include "OtherCommands.hxx"
-#include "CommandError.h"
#include "permission.h"
#include "tag.h"
diff --git a/src/CommandError.cxx b/src/CommandError.cxx
index 96b0095a..428a615e 100644
--- a/src/CommandError.cxx
+++ b/src/CommandError.cxx
@@ -18,7 +18,7 @@
*/
#include "config.h"
-#include "CommandError.h"
+#include "CommandError.hxx"
#include "db_error.h"
extern "C" {
diff --git a/src/CommandError.h b/src/CommandError.hxx
index f43afdb3..a90e2442 100644
--- a/src/CommandError.h
+++ b/src/CommandError.hxx
@@ -17,16 +17,14 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MPD_COMMAND_ERROR_H
-#define MPD_COMMAND_ERROR_H
+#ifndef MPD_COMMAND_ERROR_HXX
+#define MPD_COMMAND_ERROR_HXX
#include "command.h"
#include "playlist_error.h"
#include <glib.h>
-G_BEGIN_DECLS
-
enum command_return
print_playlist_result(struct client *client, enum playlist_result result);
@@ -36,6 +34,4 @@ print_playlist_result(struct client *client, enum playlist_result result);
enum command_return
print_error(struct client *client, GError *error);
-G_END_DECLS
-
#endif
diff --git a/src/DatabaseCommands.cxx b/src/DatabaseCommands.cxx
index 14e83e96..c3c22482 100644
--- a/src/DatabaseCommands.cxx
+++ b/src/DatabaseCommands.cxx
@@ -23,7 +23,7 @@
#include "DatabasePlaylist.hxx"
#include "DatabasePrint.hxx"
#include "DatabaseSelection.hxx"
-#include "CommandError.h"
+#include "CommandError.hxx"
#include "client_internal.h"
#include "tag.h"
#include "uri.h"
diff --git a/src/OtherCommands.cxx b/src/OtherCommands.cxx
index 29ddd996..1442ef05 100644
--- a/src/OtherCommands.cxx
+++ b/src/OtherCommands.cxx
@@ -20,7 +20,7 @@
#include "config.h"
#include "OtherCommands.hxx"
#include "DatabaseCommands.hxx"
-#include "CommandError.h"
+#include "CommandError.hxx"
#include "directory.h"
#include "song.h"
diff --git a/src/PlayerCommands.cxx b/src/PlayerCommands.cxx
index 030e8016..015ac9a1 100644
--- a/src/PlayerCommands.cxx
+++ b/src/PlayerCommands.cxx
@@ -19,7 +19,7 @@
#include "config.h"
#include "PlayerCommands.hxx"
-#include "CommandError.h"
+#include "CommandError.hxx"
#include "PlaylistPrint.hxx"
extern "C" {
diff --git a/src/PlaylistCommands.cxx b/src/PlaylistCommands.cxx
index d6be3ff3..2789e6c4 100644
--- a/src/PlaylistCommands.cxx
+++ b/src/PlaylistCommands.cxx
@@ -20,7 +20,7 @@
#include "config.h"
#include "PlaylistCommands.hxx"
#include "DatabasePlaylist.hxx"
-#include "CommandError.h"
+#include "CommandError.hxx"
#include "PlaylistPrint.hxx"
extern "C" {
diff --git a/src/QueueCommands.cxx b/src/QueueCommands.cxx
index 5dac6a8a..cdd58d31 100644
--- a/src/QueueCommands.cxx
+++ b/src/QueueCommands.cxx
@@ -19,7 +19,7 @@
#include "config.h"
#include "QueueCommands.hxx"
-#include "CommandError.h"
+#include "CommandError.hxx"
#include "DatabaseQueue.hxx"
#include "SongFilter.hxx"
#include "PlaylistPrint.hxx"