diff options
Diffstat (limited to '')
| -rw-r--r-- | src/CommandLine.cxx (renamed from src/cmdline.c) | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/cmdline.c b/src/CommandLine.cxx index cb7eff36a..4d9d2ca9d 100644 --- a/src/cmdline.c +++ b/src/CommandLine.cxx @@ -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,19 +18,23 @@ */ #include "config.h" -#include "cmdline.h" +#include "CommandLine.hxx" #include "path.h" +#include "ls.hxx" + +extern "C" { #include "log.h" #include "conf.h" +} + #include "decoder_list.h" #include "decoder_plugin.h" -#include "output_list.h" +#include "OutputList.hxx" #include "output_plugin.h" #include "input_registry.h" #include "input_plugin.h" #include "playlist_list.h" #include "playlist_plugin.h" -#include "ls.h" #include "mpd_error.h" #include "glib_compat.h" @@ -159,7 +163,7 @@ parse_cmdline(int argc, char **argv, struct options *options, "verbose logging", NULL }, { "version", 'V', 0, G_OPTION_ARG_NONE, &option_version, "print version number", NULL }, - { .long_name = NULL } + { nullptr, 0, 0, G_OPTION_ARG_NONE, nullptr, nullptr, nullptr } }; options->kill = false; |