summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@musicpd.org>2019-04-18 09:20:12 +0200
committerMax Kellermann <max@musicpd.org>2019-04-18 09:20:12 +0200
commitd6dbf64efb9f6e678ad67647d42ed120fc581c37 (patch)
tree408a21bb8376899d54f99bf2068928f3bbaef68c /src
parent8d18b4c24b776fe62c39ad9ce72e1e57ac0aa3ea (diff)
CommandLine: fix another build failure with -Ddatabase=false
Split several printf() calls to make it easier to deal with all those #ifdefs.
Diffstat (limited to 'src')
-rw-r--r--src/CommandLine.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx
index b820e396b..5ede49580 100644
--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@@ -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 <warren.dukes@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"
- "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);
@@ -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");