diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-31 19:34:28 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-31 19:34:28 +0000 |
| commit | bcd3e8fe43f49f221226fdab8873a844b29f18b5 (patch) | |
| tree | a5aeb12b438bd4337493728bd4317ec66fa4849c /main/ast_expr2.h | |
| parent | 5171d4a7f49bc873ffebbda56aaedaead4815a41 (diff) | |
Merged revisions 166953 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r166953 | tilghman | 2008-12-31 13:20:35 -0600 (Wed, 31 Dec 2008) | 5 lines
Also inherit the musiconhold class.
(Closes #14153)
Reported by: Jerry Geis, via the users list.
Patch by: me (license 14)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@166954 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/ast_expr2.h')
| -rw-r--r-- | main/ast_expr2.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/ast_expr2.h b/main/ast_expr2.h index d2a560aa1..5ae12ac04 100644 --- a/main/ast_expr2.h +++ b/main/ast_expr2.h @@ -94,13 +94,13 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 342 "ast_expr2.y" +#line 344 "/home/tilghman/Asterisk/asterisk-trunk/main/ast_expr2.y" { struct val *val; struct expr_node *arglist; } /* Line 1489 of yacc.c. */ -#line 104 "ast_expr2.h" +#line 104 "/home/tilghman/Asterisk/asterisk-trunk/main/ast_expr2.h" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 |