aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/CommandLine.cxx2
-rw-r--r--src/OtherCommands.cxx2
-rw-r--r--src/PlaylistCommands.cxx2
-rw-r--r--src/PlaylistSong.cxx2
-rw-r--r--src/QueueCommands.cxx2
-rw-r--r--src/ls.cxx2
-rw-r--r--src/ls.hxx (renamed from src/ls.h)6
7 files changed, 9 insertions, 9 deletions
diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx
index ea5432f92..a784c824b 100644
--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@@ -20,11 +20,11 @@
#include "config.h"
#include "CommandLine.hxx"
#include "path.h"
+#include "ls.hxx"
extern "C" {
#include "log.h"
#include "conf.h"
-#include "ls.h"
}
#include "decoder_list.h"
diff --git a/src/OtherCommands.cxx b/src/OtherCommands.cxx
index f7f225f63..7958b8711 100644
--- a/src/OtherCommands.cxx
+++ b/src/OtherCommands.cxx
@@ -31,9 +31,9 @@
#include "DecoderPrint.hxx"
#include "protocol/ArgParser.hxx"
#include "protocol/Result.hxx"
+#include "ls.hxx"
extern "C" {
-#include "ls.h"
#include "uri.h"
#include "volume.h"
#include "stats.h"
diff --git a/src/PlaylistCommands.cxx b/src/PlaylistCommands.cxx
index 5a767576a..db5f6859c 100644
--- a/src/PlaylistCommands.cxx
+++ b/src/PlaylistCommands.cxx
@@ -29,10 +29,10 @@
#include "ClientInternal.hxx"
#include "protocol/ArgParser.hxx"
#include "protocol/Result.hxx"
+#include "ls.hxx"
extern "C" {
#include "playlist.h"
-#include "ls.h"
#include "uri.h"
}
diff --git a/src/PlaylistSong.cxx b/src/PlaylistSong.cxx
index 6bdb164fd..4bfcc5969 100644
--- a/src/PlaylistSong.cxx
+++ b/src/PlaylistSong.cxx
@@ -22,12 +22,12 @@
#include "Mapper.hxx"
#include "DatabasePlugin.hxx"
#include "DatabaseGlue.hxx"
+#include "ls.hxx"
extern "C" {
#include "song.h"
#include "uri.h"
#include "path.h"
-#include "ls.h"
#include "tag.h"
}
diff --git a/src/QueueCommands.cxx b/src/QueueCommands.cxx
index 185f32990..dc73132e5 100644
--- a/src/QueueCommands.cxx
+++ b/src/QueueCommands.cxx
@@ -27,10 +27,10 @@
#include "ClientInternal.hxx"
#include "protocol/ArgParser.hxx"
#include "protocol/Result.hxx"
+#include "ls.hxx"
extern "C" {
#include "playlist.h"
-#include "ls.h"
#include "uri.h"
}
diff --git a/src/ls.cxx b/src/ls.cxx
index 9c3a307c7..9f81747a6 100644
--- a/src/ls.cxx
+++ b/src/ls.cxx
@@ -18,9 +18,9 @@
*/
#include "config.h"
+#include "ls.hxx"
extern "C" {
-#include "ls.h"
#include "uri.h"
}
diff --git a/src/ls.h b/src/ls.hxx
index 15cb01160..004bd2f8e 100644
--- a/src/ls.h
+++ b/src/ls.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_LS_H
-#define MPD_LS_H
+#ifndef MPD_LS_HXX
+#define MPD_LS_HXX
#include <stdbool.h>
#include <stdio.h>