diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2014-10-26 07:24:35 +0000 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-10-30 15:49:17 +0100 |
| commit | b1003c95a9561d148b39fe5bb36b0a36ff2f7306 (patch) | |
| tree | c36a5eee607988074a8262f3030226d31e9a37ff /sapi/phpdbg/phpdbg_parser.h | |
| parent | 6116c0e55970ba182724ddbfa010646901a1d5a8 (diff) | |
| download | php-git-b1003c95a9561d148b39fe5bb36b0a36ff2f7306.tar.gz | |
remove dodgy param parser, bring userland breakpoint api inline with PHP7
Conflicts:
sapi/phpdbg/phpdbg_parser.c
sapi/phpdbg/phpdbg_parser.h
Diffstat (limited to 'sapi/phpdbg/phpdbg_parser.h')
| -rw-r--r-- | sapi/phpdbg/phpdbg_parser.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sapi/phpdbg/phpdbg_parser.h b/sapi/phpdbg/phpdbg_parser.h index b3aadb9c62..da5892ac99 100644 --- a/sapi/phpdbg/phpdbg_parser.h +++ b/sapi/phpdbg/phpdbg_parser.h @@ -1,8 +1,8 @@ -/* A Bison parser, made by GNU Bison 2.6.2. */ +/* A Bison parser, made by GNU Bison 2.7.12-4996. */ /* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2013 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 @@ -30,8 +30,8 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ -#ifndef PHPDBG_SAPI_PHPDBG_PHPDBG_PARSER_H -# define PHPDBG_SAPI_PHPDBG_PHPDBG_PARSER_H +#ifndef YY_PHPDBG_SAPI_PHPDBG_PHPDBG_PARSER_H_INCLUDED +# define YY_PHPDBG_SAPI_PHPDBG_PHPDBG_PARSER_H_INCLUDED /* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -40,8 +40,8 @@ extern int phpdbg_debug; #endif /* "%code requires" blocks. */ -/* Line 2055 of yacc.c */ -#line 31 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y" +/* Line 2060 of yacc.c */ +#line 31 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_parser.y" #include "phpdbg.h" #ifndef YY_TYPEDEF_YY_SCANNER_T @@ -50,7 +50,7 @@ typedef void* yyscan_t; #endif -/* Line 2055 of yacc.c */ +/* Line 2060 of yacc.c */ #line 55 "sapi/phpdbg/phpdbg_parser.h" /* Tokens. */ @@ -123,4 +123,4 @@ int phpdbg_parse (); #endif #endif /* ! YYPARSE_PARAM */ -#endif /* !PHPDBG_SAPI_PHPDBG_PHPDBG_PARSER_H */ +#endif /* !YY_PHPDBG_SAPI_PHPDBG_PHPDBG_PARSER_H_INCLUDED */ |