*** empty log message ***

[lilypond.git] / flower / getopt-long.cc

diff --git a/flower/getopt-long.cc b/flower/getopt-long.cc
index e3da98695f26d3d744e260df916591af2996e629..0cc117b9ae066eb3b85cdce286d8bbb43584eded 100644 (file)
--- a/flower/getopt-long.cc
+++ b/flower/getopt-long.cc
@@ -1,22 +1,20 @@
 /*
    process command line, GNU style.
 
-   this is (Copyleft) 1996, Han-Wen Nienhuys, <hanwen@cs.uu.nl>
+   this is Copyleft (c) 1996--2005 Han-Wen Nienhuys, <hanwen@cs.uu.nl>
  */
 
-#include <string.h>
-#include <stdio.h>
-#include <assert.h>
-#include <stdlib.h>
+#include "getopt-long.hh"
+
+#include <cstring>
+#include <cassert>
+#include <cstdlib>
 
 #include <iostream>
 
-#include "config.h"
-#include "getopt-long.hh"
-#include "international.hh"
+#include "config.hh"
 #include "string-convert.hh"
 
-
 #if !HAVE_GETTEXT
 inline char*
 gettext (char const* s)
@@ -113,7 +111,7 @@ Long_option_init::str_for_help () const
   else
     s = "  ";
 
-  s = s + ((shortname_char_ && longname_str0_) ? "," : " ");
+  s = s + ((shortname_char_ && longname_str0_) ? ", " : "  ");
 
   if (longname_str0_)
     s = s + "--" + longname_str0_;