aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am5
-rw-r--r--src/CommandLine.cxx1
-rw-r--r--src/ConfigFile.cxx2
-rw-r--r--src/DatabaseSave.cxx5
-rw-r--r--src/Directory.cxx1
-rw-r--r--src/ExcludeList.cxx5
-rw-r--r--src/InotifyUpdate.cxx5
-rw-r--r--src/Main.cxx2
-rw-r--r--src/Mapper.cxx5
-rw-r--r--src/Path.cxx (renamed from src/path.c)4
-rw-r--r--src/Path.hxx (renamed from src/path.h)14
-rw-r--r--src/PlaylistFile.cxx2
-rw-r--r--src/PlaylistSave.cxx2
-rw-r--r--src/PlaylistSong.cxx2
-rw-r--r--src/SongFilter.cxx1
-rw-r--r--src/UpdateWalk.cxx2
16 files changed, 22 insertions, 36 deletions
diff --git a/Makefile.am b/Makefile.am
index 36684f990..ab1c5d261 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -98,7 +98,6 @@ mpd_headers = \
src/daemon.h \
src/AudioCompress/config.h \
src/AudioCompress/compress.h \
- src/path.h \
src/open.h \
src/page.h \
src/Playlist.hxx \
@@ -246,7 +245,7 @@ src_mpd_SOURCES = \
src/MusicBuffer.cxx src/MusicBuffer.hxx \
src/MusicPipe.cxx src/MusicPipe.hxx \
src/MusicChunk.cxx src/MusicChunk.hxx \
- src/path.c \
+ src/Path.cxx src/Path.hxx \
src/Mapper.cxx src/Mapper.hxx \
src/page.c \
src/Partition.hxx \
@@ -1060,7 +1059,7 @@ test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \
src/DatabaseLock.cxx src/DatabaseSave.cxx \
src/Song.cxx src/song_sort.c src/SongSave.cxx \
src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \
- src/path.c \
+ src/Path.cxx \
src/SongFilter.cxx \
src/TextFile.cxx \
src/ConfigFile.cxx src/tokenizer.c src/utils.c src/string_util.c
diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx
index a8608af9c..e9766dfae 100644
--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@@ -19,7 +19,6 @@
#include "config.h"
#include "CommandLine.hxx"
-#include "path.h"
#include "ls.hxx"
#include "Log.hxx"
#include "conf.h"
diff --git a/src/ConfigFile.cxx b/src/ConfigFile.cxx
index fd08f52b1..ce71b21d2 100644
--- a/src/ConfigFile.cxx
+++ b/src/ConfigFile.cxx
@@ -26,7 +26,7 @@ extern "C" {
#include "tokenizer.h"
}
-#include "path.h"
+#include "Path.hxx"
#include "mpd_error.h"
#include <glib.h>
diff --git a/src/DatabaseSave.cxx b/src/DatabaseSave.cxx
index 5100c2a0b..029189ae5 100644
--- a/src/DatabaseSave.cxx
+++ b/src/DatabaseSave.cxx
@@ -26,10 +26,7 @@
#include "TextFile.hxx"
#include "TagInternal.hxx"
#include "tag.h"
-
-extern "C" {
-#include "path.h"
-}
+#include "Path.hxx"
#include <glib.h>
diff --git a/src/Directory.cxx b/src/Directory.cxx
index f27b3d474..2b1a34cbf 100644
--- a/src/Directory.cxx
+++ b/src/Directory.cxx
@@ -26,7 +26,6 @@
extern "C" {
#include "song.h"
#include "song_sort.h"
-#include "path.h"
#include "util/list_sort.h"
}
diff --git a/src/ExcludeList.cxx b/src/ExcludeList.cxx
index 4beb7afc3..2c2dc952f 100644
--- a/src/ExcludeList.cxx
+++ b/src/ExcludeList.cxx
@@ -24,10 +24,7 @@
#include "config.h"
#include "ExcludeList.hxx"
-
-extern "C" {
-#include "path.h"
-}
+#include "Path.hxx"
#include <assert.h>
#include <string.h>
diff --git a/src/InotifyUpdate.cxx b/src/InotifyUpdate.cxx
index 7ed0e84ba..a1c3e0393 100644
--- a/src/InotifyUpdate.cxx
+++ b/src/InotifyUpdate.cxx
@@ -23,10 +23,7 @@
#include "InotifyQueue.hxx"
#include "Mapper.hxx"
#include "Main.hxx"
-
-extern "C" {
-#include "path.h"
-}
+#include "Path.hxx"
#include <glib.h>
#include <assert.h>
diff --git a/src/Main.cxx b/src/Main.cxx
index 6ccede6f1..dd269354d 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -47,10 +47,10 @@
#include "InputInit.hxx"
#include "event/Loop.hxx"
#include "IOThread.hxx"
+#include "Path.hxx"
extern "C" {
#include "daemon.h"
-#include "path.h"
#include "stats.h"
#include "audio_config.h"
#include "pcm_resample.h"
diff --git a/src/Mapper.cxx b/src/Mapper.cxx
index 4d863418b..1a5ebe111 100644
--- a/src/Mapper.cxx
+++ b/src/Mapper.cxx
@@ -25,10 +25,7 @@
#include "Mapper.hxx"
#include "Directory.hxx"
#include "song.h"
-
-extern "C" {
-#include "path.h"
-}
+#include "Path.hxx"
#include <glib.h>
diff --git a/src/path.c b/src/Path.cxx
index 21a4dd41e..ab8a4e3cc 100644
--- a/src/path.c
+++ b/src/Path.cxx
@@ -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
@@ -18,7 +18,7 @@
*/
#include "config.h"
-#include "path.h"
+#include "Path.hxx"
#include "conf.h"
#include "mpd_error.h"
#include "gcc.h"
diff --git a/src/path.h b/src/Path.hxx
index 00c368e70..db3f95961 100644
--- a/src/path.h
+++ b/src/Path.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,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MPD_PATH_H
-#define MPD_PATH_H
+#ifndef MPD_PATH_HXX
+#define MPD_PATH_HXX
+
+#include "check.h"
#include <limits.h>
@@ -32,9 +34,9 @@
# endif
#endif
-void path_global_init(void);
+void path_global_init();
-void path_global_finish(void);
+void path_global_finish();
/**
* Converts a file name in the filesystem charset to UTF-8. Returns
@@ -50,6 +52,6 @@ fs_charset_to_utf8(const char *path_fs);
char *
utf8_to_fs_charset(const char *path_utf8);
-const char *path_get_fs_charset(void);
+const char *path_get_fs_charset();
#endif
diff --git a/src/PlaylistFile.cxx b/src/PlaylistFile.cxx
index d79bea9c5..486c93994 100644
--- a/src/PlaylistFile.cxx
+++ b/src/PlaylistFile.cxx
@@ -30,9 +30,9 @@
#include "TextFile.hxx"
#include "conf.h"
#include "Idle.hxx"
+#include "Path.hxx"
extern "C" {
-#include "path.h"
#include "uri.h"
}
diff --git a/src/PlaylistSave.cxx b/src/PlaylistSave.cxx
index 745744490..5f47d73c0 100644
--- a/src/PlaylistSave.cxx
+++ b/src/PlaylistSave.cxx
@@ -24,9 +24,9 @@
#include "song.h"
#include "Mapper.hxx"
#include "Idle.hxx"
+#include "Path.hxx"
extern "C" {
-#include "path.h"
#include "uri.h"
}
diff --git a/src/PlaylistSong.cxx b/src/PlaylistSong.cxx
index 118fb5715..ec27656f2 100644
--- a/src/PlaylistSong.cxx
+++ b/src/PlaylistSong.cxx
@@ -24,11 +24,11 @@
#include "DatabaseGlue.hxx"
#include "ls.hxx"
#include "tag.h"
+#include "Path.hxx"
extern "C" {
#include "song.h"
#include "uri.h"
-#include "path.h"
}
#include <glib.h>
diff --git a/src/SongFilter.cxx b/src/SongFilter.cxx
index 6d6841675..0e138386b 100644
--- a/src/SongFilter.cxx
+++ b/src/SongFilter.cxx
@@ -19,7 +19,6 @@
#include "config.h"
#include "SongFilter.hxx"
-#include "path.h"
#include "song.h"
#include "tag.h"
diff --git a/src/UpdateWalk.cxx b/src/UpdateWalk.cxx
index 208e6290a..1716862b5 100644
--- a/src/UpdateWalk.cxx
+++ b/src/UpdateWalk.cxx
@@ -31,10 +31,10 @@
#include "Mapper.hxx"
#include "ExcludeList.hxx"
#include "conf.h"
+#include "Path.hxx"
extern "C" {
#include "uri.h"
-#include "path.h"
#include "playlist_list.h"
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 01:48:39 +0000