diff options
| author | Akim Demaille <akim@lrde.epita.fr> | 2012-10-26 16:50:26 +0200 |
|---|---|---|
| committer | Akim Demaille <akim@lrde.epita.fr> | 2012-10-26 16:58:55 +0200 |
| commit | d0a304384f4207bdf7f8b1038c2226c312f5e954 (patch) | |
| tree | 1362b308c1b3ae17301c56f53e62fdca13e5e1a7 /src/location.h | |
| parent | 6b1cbda1b9e0e8f29c0a6e4e44ce2d5a2aee974f (diff) | |
| parent | 71cb558dfe0f9c80e697308a5084de3b9926ee9c (diff) | |
| download | bison-d0a304384f4207bdf7f8b1038c2226c312f5e954.tar.gz | |
Merge remote-tracking branch 'origin/maint'
* origin/maint: (46 commits)
doc: minor style change
maint: use gendocs's new -I option
regen
yacc.c: do not define location support when not using locations
maint: be compilable with GCC 4.0
tests: address a warning from GCC 4.4
tests: don't use options that Clang does not support
tests: restore the tests on -Werror
regen
parse-gram: update the Bison interface
fix comment
maint: post-release administrivia
version 2.6.4
regen
2.6.4: botched 2.6.3
maint: post-release administrivia
version 2.6.3
gnulib: update
tests: check %no-lines
NEWS: warnings with clang
...
Conflicts:
NEWS
TODO
data/c.m4
data/java.m4
doc/Makefile.am
src/getargs.c
src/getargs.h
src/output.c
src/parse-gram.c
src/parse-gram.h
src/parse-gram.y
src/reader.h
Diffstat (limited to 'src/location.h')
| -rw-r--r-- | src/location.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/location.h b/src/location.h index 17da73ca..369125b7 100644 --- a/src/location.h +++ b/src/location.h @@ -88,7 +88,7 @@ typedef struct } location; -#define YYLTYPE location +#define GRAM_LTYPE location #define EMPTY_LOCATION_INIT {{NULL, 0, 0}, {NULL, 0, 0}} extern location const empty_location; |