diff options
| author | Russell Bryant <russell@russellbryant.com> | 2006-06-18 21:36:24 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2006-06-18 21:36:24 +0000 |
| commit | 73ae55698fdc5ffc2a0f0d8c4a499cd9b09dc562 (patch) | |
| tree | 8c013c06f433598c8319a154dce0cade99d7145a /pbx/ael/ael.tab.h | |
| parent | c229baa0cf759b8ad9b30f931b5916c75efa0231 (diff) | |
merge changes from team/murf/AEL-trunk-fixesonly
- fix callerid matching for extensions
- fix nested switch statements
- fix compilation with bison 2.1a or higher
(issue #7309)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@34665 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx/ael/ael.tab.h')
| -rw-r--r-- | pbx/ael/ael.tab.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pbx/ael/ael.tab.h b/pbx/ael/ael.tab.h index 60aff7d61..2daac4ab2 100644 --- a/pbx/ael/ael.tab.h +++ b/pbx/ael/ael.tab.h @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 2.1. */ +/* A Bison parser, made by GNU Bison 2.1a. */ /* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -114,15 +114,17 @@ -#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +typedef union YYSTYPE #line 48 "ael.y" -typedef union YYSTYPE { +{ int intval; /* integer value, typically flags */ char *str; /* strings */ struct pval *pval; /* full objects */ -} YYSTYPE; -/* Line 1447 of yacc.c. */ -#line 126 "ael.tab.h" +} +/* Line 1536 of yacc.c. */ +#line 127 "ael.tab.h" + YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -130,7 +132,7 @@ typedef union YYSTYPE { -#if ! defined (YYLTYPE) && ! defined (YYLTYPE_IS_DECLARED) +#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED typedef struct YYLTYPE { int first_line; |