diff options
| author | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
| commit | b68da91d52801fb2cc4d2a4a44c859ea5b6c622b (patch) | |
| tree | 290f7c8ea7fd2df02c995b07c1d490c2de333db5 /sapi/phpdbg/phpdbg_eol.c | |
| parent | 4f6539bdaf62f0343f4ec67638d2f96e8c1c00ae (diff) | |
| parent | a9e86957c70c181e830ba05bb030c468d0cb15e1 (diff) | |
| download | php-git-b68da91d52801fb2cc4d2a4a44c859ea5b6c622b.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/config.m4
ext/json/config.w32
ext/json/json.c
ext/json/php_json.h
Diffstat (limited to 'sapi/phpdbg/phpdbg_eol.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_eol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sapi/phpdbg/phpdbg_eol.c b/sapi/phpdbg/phpdbg_eol.c index fc20d567bc..47643aae8d 100644 --- a/sapi/phpdbg/phpdbg_eol.c +++ b/sapi/phpdbg/phpdbg_eol.c @@ -33,7 +33,7 @@ struct phpdbg_eol_rep phpdbg_eol_list[EOL_LIST_LEN] = { {"CR", "\r", PHPDBG_EOL_CR}, }; -int phpdbg_eol_global_update(char *name TSRMLS_DC) +int phpdbg_eol_global_update(char *name) { if (0 == memcmp(name, "CRLF", 4) || 0 == memcmp(name, "crlf", 4) || 0 == memcmp(name, "DOS", 3) || 0 == memcmp(name, "dos", 3)) { @@ -83,7 +83,7 @@ char *phpdbg_eol_rep(int id) /* Inspired by https://ccrma.stanford.edu/~craig/utility/flip/flip.cpp */ -void phpdbg_eol_convert(char **str, int *len TSRMLS_DC) +void phpdbg_eol_convert(char **str, int *len) { char *in = *str, *out ; int in_len = *len, out_len, cursor, i; |