diff options
| author | Daniel Walton <dwalton@cumulusnetworks.com> | 2017-06-30 17:52:56 +0000 |
|---|---|---|
| committer | Daniel Walton <dwalton@cumulusnetworks.com> | 2017-06-30 17:52:56 +0000 |
| commit | 1161690b93b48fbd07f4ee25c1261574db8d71c5 (patch) | |
| tree | 7ffbe5c3b333b1fe0b8a3f042d8b1af602d48019 /lib/command_parse.y | |
| parent | ab782c96f881b1fdd59f52ba972cd82b5eeadc66 (diff) | |
| parent | 5fca4e3635c2778e8349bce0eaf944c26913d321 (diff) | |
Merge branch 'master' of https://github.com/dwalton76/frr into bgpd-ipv4-plus-label-misc3
Conflicts:
bgpd/bgp_route.c
Diffstat (limited to 'lib/command_parse.y')
| -rw-r--r-- | lib/command_parse.y | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/command_parse.y b/lib/command_parse.y index 466e3d3f1f..3337481094 100644 --- a/lib/command_parse.y +++ b/lib/command_parse.y @@ -44,6 +44,8 @@ * struct parser_ctx is needed for the bison forward decls. */ %code requires { + #include "config.h" + #include <stdlib.h> #include <string.h> #include <ctype.h> @@ -189,7 +191,7 @@ start: varname_token: '$' WORD { - $$ = XSTRDUP (MTYPE_LEX, $2); + $$ = $2; } | /* empty */ { |
