aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am14
-rw-r--r--src/CommandLine.cxx6
-rw-r--r--src/Log.cxx (renamed from src/log.c)4
-rw-r--r--src/Log.hxx (renamed from src/log.h)6
-rw-r--r--src/Main.cxx4
-rw-r--r--src/SignalHandlers.cxx (renamed from src/sig_handlers.c)4
-rw-r--r--src/SignalHandlers.hxx (renamed from src/sig_handlers.h)6
7 files changed, 19 insertions, 25 deletions
diff --git a/Makefile.am b/Makefile.am
index 5ddeba9fe..779ddc1a3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -92,7 +92,6 @@ mpd_headers = \
src/icy_server.h \
src/icy_metadata.h \
src/server_socket.h \
- src/log.h \
src/ls.h \
src/mixer_api.h \
src/mixer_control.h \
@@ -129,7 +128,6 @@ mpd_headers = \
src/replay_gain_config.h \
src/replay_gain_info.h \
src/replay_gain_ape.h \
- src/sig_handlers.h \
src/TimePrint.cxx src/TimePrint.hxx \
src/song.h \
src/song_sort.c src/song_sort.h \
@@ -240,7 +238,7 @@ src_mpd_SOURCES = \
src/ClientFile.cxx src/ClientFile.hxx \
src/server_socket.c \
src/Listen.cxx src/Listen.hxx \
- src/log.c \
+ src/Log.cxx src/Log.hxx \
src/ls.cxx \
src/io_error.h \
src/io_thread.c src/io_thread.h \
@@ -279,7 +277,7 @@ src_mpd_SOURCES = \
src/QueueSave.cxx src/QueueSave.hxx \
src/ReplayGainConfig.cxx \
src/ReplayGainInfo.cxx \
- src/sig_handlers.c \
+ src/SignalHandlers.cxx src/SignalHandlers.hxx \
src/Song.cxx \
src/SongUpdate.cxx \
src/SongPrint.cxx src/SongPrint.hxx \
@@ -1118,7 +1116,7 @@ test_run_decoder_LDADD = \
test_run_decoder_SOURCES = test/run_decoder.c \
test/stdbin.h \
src/io_thread.c src/io_thread.h \
- src/conf.c src/tokenizer.c src/utils.c src/string_util.c src/log.c \
+ src/conf.c src/tokenizer.c src/utils.c src/string_util.c \
src/Tag.cxx src/TagNames.c src/TagPool.cxx src/tag_handler.c \
src/ReplayGainInfo.cxx \
src/uri.c \
@@ -1140,7 +1138,7 @@ test_read_tags_LDADD = \
$(GLIB_LIBS)
test_read_tags_SOURCES = test/read_tags.c \
src/io_thread.c src/io_thread.h \
- src/conf.c src/tokenizer.c src/utils.c src/string_util.c src/log.c \
+ src/conf.c src/tokenizer.c src/utils.c src/string_util.c \
src/Tag.cxx src/TagNames.c src/TagPool.cxx src/tag_handler.c \
src/ReplayGainInfo.cxx \
src/uri.c \
@@ -1263,7 +1261,7 @@ test_run_output_LDADD = $(MPD_LIBS) \
test_run_output_SOURCES = test/run_output.cxx \
test/FakeReplayGainConfig.cxx \
test/stdbin.h \
- src/conf.c src/tokenizer.c src/utils.c src/string_util.c src/log.c \
+ src/conf.c src/tokenizer.c src/utils.c src/string_util.c \
src/io_thread.c src/io_thread.h \
src/audio_check.c \
src/audio_format.c \
@@ -1292,7 +1290,7 @@ test_read_mixer_LDADD = \
$(OUTPUT_LIBS) \
$(GLIB_LIBS)
test_read_mixer_SOURCES = test/read_mixer.c \
- src/conf.c src/tokenizer.c src/utils.c src/string_util.c src/log.c \
+ src/conf.c src/tokenizer.c src/utils.c src/string_util.c \
src/mixer_control.c src/mixer_api.c \
src/filter_plugin.c \
src/filter/volume_filter_plugin.c \
diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx
index 670995214..6f9528a4e 100644
--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@@ -21,11 +21,7 @@
#include "CommandLine.hxx"
#include "path.h"
#include "ls.hxx"
-
-extern "C" {
-#include "log.h"
-}
-
+#include "Log.hxx"
#include "conf.h"
#include "decoder_list.h"
#include "decoder_plugin.h"
diff --git a/src/log.c b/src/Log.cxx
index 2d3c7cafd..7ca64197f 100644
--- a/src/log.c
+++ b/src/Log.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 "log.h"
+#include "Log.hxx"
#include "conf.h"
#include "utils.h"
#include "fd_util.h"
diff --git a/src/log.h b/src/Log.hxx
index 683ff3e9f..cfcece104 100644
--- a/src/log.h
+++ b/src/Log.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_LOG_H
-#define MPD_LOG_H
+#ifndef MPD_LOG_HXX
+#define MPD_LOG_HXX
#include <glib.h>
#include <stdbool.h>
diff --git a/src/Main.cxx b/src/Main.cxx
index d05a95947..c66943070 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -41,15 +41,15 @@
#include "conf.h"
#include "replay_gain_config.h"
#include "Idle.hxx"
+#include "SignalHandlers.hxx"
+#include "Log.hxx"
extern "C" {
#include "daemon.h"
#include "io_thread.h"
#include "path.h"
#include "stats.h"
-#include "sig_handlers.h"
#include "audio_config.h"
-#include "log.h"
#include "pcm_resample.h"
#include "decoder_list.h"
#include "input_init.h"
diff --git a/src/sig_handlers.c b/src/SignalHandlers.cxx
index eabca1997..dfef9bf84 100644
--- a/src/sig_handlers.c
+++ b/src/SignalHandlers.cxx
@@ -18,11 +18,11 @@
*/
#include "config.h"
-#include "sig_handlers.h"
+#include "SignalHandlers.hxx"
#ifndef WIN32
-#include "log.h"
+#include "Log.hxx"
#include "Main.hxx"
#include "event_pipe.h"
#include "mpd_error.h"
diff --git a/src/sig_handlers.h b/src/SignalHandlers.hxx
index 32e9bad95..99f347fb0 100644
--- a/src/sig_handlers.h
+++ b/src/SignalHandlers.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_SIG_HANDLERS_H
-#define MPD_SIG_HANDLERS_H
+#ifndef MPD_SIGNAL_HANDLERS_HXX
+#define MPD_SIGNAL_HANDLERS_HXX
void initSigHandlers(void);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 02:14:29 +0000