diff options
| author | Anatol Belski <ab@php.net> | 2014-04-24 11:07:08 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-04-24 11:07:08 +0200 |
| commit | ceec2152a680821fadeac245c9769f83c8570bf6 (patch) | |
| tree | cfa58be796253c19181b7e0e31476fde71c99f8b /sapi/phpdbg/phpdbg_lexer.l | |
| parent | 60f976a45e67f5d7630b8ddb12e89d22d27f5e1f (diff) | |
| parent | cd2641973cbd665301739593a291a1fa78a05578 (diff) | |
| download | php-git-ceec2152a680821fadeac245c9769f83c8570bf6.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
use a portable strndup implementation
fixed C89 compat
prepare config.w32
add parser files to dist
Diffstat (limited to 'sapi/phpdbg/phpdbg_lexer.l')
| -rw-r--r-- | sapi/phpdbg/phpdbg_lexer.l | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sapi/phpdbg/phpdbg_lexer.l b/sapi/phpdbg/phpdbg_lexer.l index ad5edd9f8f..b3536feab8 100644 --- a/sapi/phpdbg/phpdbg_lexer.l +++ b/sapi/phpdbg/phpdbg_lexer.l @@ -77,7 +77,7 @@ INPUT [^\n]+ <INITIAL,NORMAL>{ {ID}[:]{1}[//]{2} { phpdbg_init_param(yylval, STR_PARAM); - yylval->str = strndup(yytext, yyleng); + yylval->str = zend_strndup(yytext, yyleng); yylval->len = yyleng; return T_PROTO; } @@ -107,13 +107,13 @@ INPUT [^\n]+ } {OPCODE} { phpdbg_init_param(yylval, OP_PARAM); - yylval->str = strndup(yytext, yyleng); + yylval->str = zend_strndup(yytext, yyleng); yylval->len = yyleng; return T_OPCODE; } {ID} { phpdbg_init_param(yylval, STR_PARAM); - yylval->str = strndup(yytext, yyleng); + yylval->str = zend_strndup(yytext, yyleng); yylval->len = yyleng; return T_ID; } @@ -121,7 +121,7 @@ INPUT [^\n]+ <RAW>{INPUT} { phpdbg_init_param(yylval, STR_PARAM); - yylval->str = strndup(yytext, yyleng); + yylval->str = zend_strndup(yytext, yyleng); yylval->len = yyleng; BEGIN(INITIAL); return T_INPUT; |