Skip to content

Commit

Permalink
CommandLine: fix another build failure with -Ddatabase=false
Browse files Browse the repository at this point in the history
Split several printf() calls to make it easier to deal with all those
#ifdefs.
  • Loading branch information
MaxKellermann committed Apr 18, 2019
1 parent 8d18b4c commit d6dbf64
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/CommandLine.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,17 @@ static constexpr Domain cmdline_domain("cmdline");
gcc_noreturn
static void version(void)
{
printf("Music Player Daemon " VERSION " (%s)\n"
printf("Music Player Daemon " VERSION " (%s)"
"\n"
"Copyright 2003-2007 Warren Dukes <[email protected]>\n"
"Copyright 2008-2018 Max Kellermann <[email protected]>\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
"\n"
"Database plugins:\n",
GIT_VERSION);
printf("\n"
"Database plugins:\n");

for (auto i = database_plugins; *i != nullptr; ++i)
printf(" %s", (*i)->name);
Expand All @@ -129,18 +129,18 @@ static void version(void)
for (auto i = storage_plugins; *i != nullptr; ++i)
printf(" %s", (*i)->name);

printf("\n"
printf("\n");
#endif

#ifdef ENABLE_NEIGHBOR_PLUGINS
"\n"
printf("\n"
"Neighbor plugins:\n");
for (auto i = neighbor_plugins; *i != nullptr; ++i)
printf(" %s", (*i)->name);

printf("\n"
#endif

printf("\n"
"\n"
"Decoders plugins:\n");

Expand Down

0 comments on commit d6dbf64

Please sign in to comment.