Skip to content

M
mpd
Commit d6dbf64e authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

CommandLine: fix another build failure with -Ddatabase=false

Split several printf() calls to make it easier to deal with all those #ifdefs.
parent 8d18b4c2
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
src/CommandLine.cxx
View file @ d6dbf64e
...@@ -108,17 +108,17 @@ static constexpr Domain cmdline_domain("cmdline"); ...@@ -108,17 +108,17 @@ static constexpr Domain cmdline_domain("cmdline");
gcc_noreturn gcc_noreturn
static void version(void) static void version(void)
{ {
printf("Music Player Daemon " VERSION " (%s)\n" printf("Music Player Daemon " VERSION " (%s)"
"\n" "\n"
"Copyright 2003-2007 Warren Dukes <warren.dukes@gmail.com>\n" "Copyright 2003-2007 Warren Dukes <warren.dukes@gmail.com>\n"
"Copyright 2008-2018 Max Kellermann <max.kellermann@gmail.com>\n" "Copyright 2008-2018 Max Kellermann <max.kellermann@gmail.com>\n"
"This is free software; see the source for copying conditions. There is NO\n" "This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" "warranty; not even MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n",
GIT_VERSION);
#ifdef ENABLE_DATABASE #ifdef ENABLE_DATABASE
"\n" printf("\n"
"Database plugins:\n", "Database plugins:\n");
GIT_VERSION);
for (auto i = database_plugins; *i != nullptr; ++i) for (auto i = database_plugins; *i != nullptr; ++i)
printf(" %s", (*i)->name); printf(" %s", (*i)->name);
...@@ -129,18 +129,18 @@ static void version(void) ...@@ -129,18 +129,18 @@ static void version(void)
for (auto i = storage_plugins; *i != nullptr; ++i) for (auto i = storage_plugins; *i != nullptr; ++i)
printf(" %s", (*i)->name); printf(" %s", (*i)->name);
printf("\n" printf("\n");
#endif #endif
#ifdef ENABLE_NEIGHBOR_PLUGINS #ifdef ENABLE_NEIGHBOR_PLUGINS
"\n" printf("\n"
"Neighbor plugins:\n"); "Neighbor plugins:\n");
for (auto i = neighbor_plugins; *i != nullptr; ++i) for (auto i = neighbor_plugins; *i != nullptr; ++i)
printf(" %s", (*i)->name); printf(" %s", (*i)->name);
printf("\n"
#endif #endif
printf("\n"
"\n" "\n"
"Decoders plugins:\n"); "Decoders plugins:\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment