diff options
| author | Theophile Ranquet <ranquet@lrde.epita.fr> | 2012-12-06 11:43:02 +0100 |
|---|---|---|
| committer | Theophile Ranquet <ranquet@lrde.epita.fr> | 2012-12-06 13:38:43 +0100 |
| commit | f3ead217b8636f623399e66bd937b1c51774d4af (patch) | |
| tree | 074e97d4d5adbc914e312dbdb84c642d995355c4 /m4 | |
| parent | d6dc4d36d1db744b060029254eaabaaa525a1c19 (diff) | |
| parent | 9960a6ae75842aa7836f39b59e82eef0319338bc (diff) | |
| download | bison-f3ead217b8636f623399e66bd937b1c51774d4af.tar.gz | |
Merge remote-tracking branch 'origin/maint'
* origin/maint:
misc: pacify the Tiny C Compiler
cpp: make the check of Flex version portable
misc: require getline
c++: support wide strings for file names
doc: document carets
tests: enhance existing tests with carets
errors: show carets
getargs: add support for --flags/-f
Conflicts:
doc/bison.texi
m4/.gitignore
src/complain.c
src/flex-scanner.h
src/getargs.c
src/getargs.h
src/gram.c
src/main.c
tests/headers.at
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/.gitignore | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/m4/.gitignore b/m4/.gitignore index 80193dbb..242ac2a7 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -63,7 +63,6 @@ /isnand.m4 /isnanf.m4 /isnanl.m4 -/iswblank.m4 /javacomp.m4 /javaexec.m4 /largefile.m4 @@ -82,8 +81,6 @@ /longlong.m4 /malloc.m4 /math_h.m4 -/mbchar.m4 -/mbiter.m4 /mbrtowc.m4 /mbsinit.m4 /mbstate_t.m4 @@ -183,3 +180,6 @@ /obstack-printf.m4 /extern-inline.m4 /non-recursive-gnulib-prefix-hack.m4 +/getdelim.m4 +/getline.m4 +/inline.m4 |