aboutsummaryrefslogtreecommitdiffstats
path: root/src/CommandLine.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-01-03 17:31:38 +0100
committerMax Kellermann <max@duempel.org>2013-01-03 17:31:38 +0100
commit1e0ea57dc4a75f846dc417996a3ec7bd18112098 (patch)
tree2a3171bfb7d7aa02d24d0474f16886be768fa417 /src/CommandLine.cxx
parent70b87f2eb620bdf1d7e07141914feb2316794fb3 (diff)
downloadmpd-1e0ea57dc4a75f846dc417996a3ec7bd18112098.tar.gz
mpd-1e0ea57dc4a75f846dc417996a3ec7bd18112098.tar.xz
mpd-1e0ea57dc4a75f846dc417996a3ec7bd18112098.zip
cmdline: convert to C++
Diffstat (limited to '')
-rw-r--r--src/CommandLine.cxx (renamed from src/cmdline.c)12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/cmdline.c b/src/CommandLine.cxx
index a972daf95..ea5432f92 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,10 +18,15 @@
*/
#include "config.h"
-#include "cmdline.h"
+#include "CommandLine.hxx"
#include "path.h"
+
+extern "C" {
#include "log.h"
#include "conf.h"
+#include "ls.h"
+}
+
#include "decoder_list.h"
#include "decoder_plugin.h"
#include "output_list.h"
@@ -30,7 +35,6 @@
#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;