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: https://origsvn.digium.com/svn/asterisk/trunk@166954 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-12-31 19:34:28 +00:00
parent c5bc0386f5
commit 7cb7920e19
3 changed files with 86 additions and 85 deletions

View File

@@ -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