merge r2104 from trunk

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2158 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c
index cfd2c84..f1e1282 100644 (file)
--- a/src/daemon/cmdline.c
+++ b/src/daemon/cmdline.c
@@ -70,7 +70,7 @@ enum {
 };
 
 /* Tabel for getopt_long() */
-static struct option long_options[] = {
+static const struct option long_options[] = {
     {"help",                        0, 0, ARG_HELP},
     {"version",                     0, 0, ARG_VERSION},
     {"dump-conf",                   0, 0, ARG_DUMP_CONF},