oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

CommandLine: hard-code `daemon=false` if ENABLE_DAEMON is not set

This commit is contained in:
Max Kellermann 2023-03-06 12:57:42 +01:00
parent 35eaed7206
commit 6e700dab69
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CommandLine.cxx
View File

@ -352,12 +352,16 @@ ParseCommandLine(int argc, char **argv, CommandLineOptions &options,
break; break;
case OPTION_NO_DAEMON: case OPTION_NO_DAEMON:
#ifdef ENABLE_DAEMON
options.daemon = false; options.daemon = false;
#endif
break; break;
#ifdef __linux__ #ifdef __linux__
case OPTION_SYSTEMD: case OPTION_SYSTEMD:
#ifdef ENABLE_DAEMON
options.daemon = false; options.daemon = false;
#endif
options.systemd = true; options.systemd = true;
break; break;
#endif #endif

7
src/CommandLine.hxx
View File

@ -20,11 +20,18 @@
#ifndef MPD_COMMAND_LINE_HXX #ifndef MPD_COMMAND_LINE_HXX
#define MPD_COMMAND_LINE_HXX #define MPD_COMMAND_LINE_HXX
#include "config.h" // for ENABLE_DAEMON
struct ConfigData; struct ConfigData;
struct CommandLineOptions { struct CommandLineOptions {
bool kill = false; bool kill = false;
#ifdef ENABLE_DAEMON
bool daemon = true; bool daemon = true;
#else
static constexpr bool daemon = false;
#endif
#ifdef __linux__ #ifdef __linux__
bool systemd = false; bool systemd = false;