Hi Achim, looks good to me. Please apply with two minor changes: On Jul 11 23:31, Achim Gratz wrote: > [...] > diff --git a/ini.cc b/ini.cc > index e90f98c..571ee2d 100644 > --- a/ini.cc > +++ b/ini.cc > @@ -39,7 +39,6 @@ > #include "mount.h" > #include "site.h" > #include "find.h" > -#include "IniParseFindVisitor.h" > #include "IniParseFeedback.h" > > #include "io_stream.h" > @@ -57,11 +56,12 @@ extern ThreeBarProgressPage Progress; > > unsigned int setup_timestamp = 0; > std::string ini_setup_version; > -std::string current_ini_sig_name; > +IniList setup_ext_list ( setup_exts, setup_exts+3); // TODO: use C++11x initializer lists Can the constant 3 go away (sizeof setup_exts / sizeof *setup_exts)? > [...] > + myFeedback.iniName (current_ini_name); > + aBuilder.parse_mirror = ""; > + ini_init (ini_file, &aBuilder, myFeedback); > + ^^^^^^^ Extra whitespaces, `git am' complains about, in the line preceeding the "yydebug = 1" comments in both, do_local_ini and do_remote_ini. > + /*yydebug = 1; */ > + > [...] > - > - /*yydebug = 1; */ > - Thanks, Corinna -- Corinna Vinschen Please, send mails regarding Cygwin to Cygwin Maintainer cygwin AT cygwin DOT com Red Hat