diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-09 22:33:06 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-09 22:33:06 +0100 |
| commit | 8eacd13ce7f528adc52614ce3cc5faf963b3fc5a (patch) | |
| tree | 5466d2e8407f00efc8ad1419509833ef3a937f2d /src | |
| parent | d3e1b72d381dc7dd01926188b6d62729788b76b9 (diff) | |
sig_handlers, log: convert to C++
Diffstat (limited to 'src')
| -rw-r--r-- | src/CommandLine.cxx | 6 | ||||
| -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.cxx | 4 | ||||
| -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 |
6 files changed, 13 insertions, 17 deletions
diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx index 67099521..6f9528a4 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" @@ -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" @@ -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 d05a9594..c6694307 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 eabca199..dfef9bf8 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 32e9bad9..99f347fb 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); |