diff options
| author | George Wang <gwang@php.net> | 2014-10-03 16:43:58 -0400 |
|---|---|---|
| committer | George Wang <gwang@php.net> | 2014-10-03 16:43:58 -0400 |
| commit | 2fd7d60ea06aa07b99dc219655be7ab42b7e2e16 (patch) | |
| tree | 2835e4d2625870eb707e0361a769e4921aff8609 /sapi/cli/php_cli.c | |
| parent | a7d2747890846ed68cc86c6e8d3fd005525ff0cc (diff) | |
| parent | e9b23401514a642b58084784305c1d19cf86a823 (diff) | |
| download | php-git-2fd7d60ea06aa07b99dc219655be7ab42b7e2e16.tar.gz | |
Merge branch 'master' of git.php.net:php-src
Diffstat (limited to 'sapi/cli/php_cli.c')
| -rw-r--r-- | sapi/cli/php_cli.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 2e714c4a90..04cbdeb8f1 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ @@ -627,8 +627,8 @@ static int cli_seek_file_begin(zend_file_handle *file_handle, char *script_file, /* handle situations where line is terminated by \r\n */ if (c == '\r') { if (fgetc(file_handle->handle.fp) != '\n') { - long pos = ftell(file_handle->handle.fp); - fseek(file_handle->handle.fp, pos - 1, SEEK_SET); + zend_long pos = zend_ftell(file_handle->handle.fp); + zend_fseek(file_handle->handle.fp, pos - 1, SEEK_SET); } } *lineno = 2; |