Merge branch 'maint'

* maint:
  use obstack_printf
  scanner: restore a missing start condition
  gnulib: update
  maint: post-release administrivia
  version 2.6.1
  gnulib: update
  maint: fix some syntax-check issues
  tests: do not depend on __cplusplus to decide for C++ or C output

Conflicts:
	NEWS
	bootstrap.conf
	cfg.mk
	lib/.gitignore
This commit is contained in:
Akim Demaille
2012-07-31 11:50:18 +02:00
16 changed files with 66 additions and 86 deletions

View File

@@ -91,7 +91,7 @@ static void fail_for_invalid_at (char const *at);
\n out_lineno++; ECHO;
[^@\n]+ ECHO;
<<EOF>> {
<INITIAL><<EOF>> {
if (outname)
{
free (outname);