diff options
author | Joe Watkins <krakjoe@php.net> | 2016-11-12 17:30:41 +0000 |
---|---|---|
committer | Joe Watkins <krakjoe@php.net> | 2016-11-12 17:30:41 +0000 |
commit | a2bc7cf9ca74c051bfd287c1b3d54c76945f10cc (patch) | |
tree | b45a5d42d9d2ab47f9f06180e12ca973d289a3cc /Zend/zend_stream.c | |
parent | 6c0e1ca4fa31a860a363abecd6376d99edff8833 (diff) | |
parent | 2104bea5d756dfa40b605a4a2765a3bc4637a76c (diff) | |
download | php-git-a2bc7cf9ca74c051bfd287c1b3d54c76945f10cc.tar.gz |
Merge branch 'master' of git.php.net:/php-src
Diffstat (limited to 'Zend/zend_stream.c')
-rw-r--r-- | Zend/zend_stream.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/Zend/zend_stream.c b/Zend/zend_stream.c index b3553bd3cc..680a50aea0 100644 --- a/Zend/zend_stream.c +++ b/Zend/zend_stream.c @@ -156,16 +156,7 @@ static size_t zend_stream_read(zend_file_handle *file_handle, char *buf, size_t int c = '*'; size_t n; -#ifdef NETWARE - /* - c != 4 check is there as fread of a character in NetWare LibC gives 4 upon ^D character. - Ascii value 4 is actually EOT character which is not defined anywhere in the LibC - or else we can use instead of hardcoded 4. - */ - for (n = 0; n < len && (c = zend_stream_getc(file_handle)) != EOF && c != 4 && c != '\n'; ++n) { -#else for (n = 0; n < len && (c = zend_stream_getc(file_handle)) != EOF && c != '\n'; ++n) { -#endif buf[n] = (char)c; } if (c == '\n') { |