com php-src: fix c/p issue: main/streams/plain_wrapper.c
| From: | Anatol Belski | Date: | Thu, 02 Jul 2015 12:22:58 +0000 |
| Subject: | com php-src: fix c/p issue: main/streams/plain_wrapper.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87701@lists.php.net to get a copy of this message | ||
Commit: 4e5758f37741187c5d5d61c5dcb3f0a472890195
Author: Anatol Belski <ab@php.net> Tue, 30 Jun 2015 17:37:38 +0200
Parents: d516a14fb93705ec03b39e611899a95bc0d591fe
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4e5758f37741187c5d5d61c5dcb3f0a472890195
Log:
fix c/p issue
Changed paths:
M main/streams/plain_wrapper.c
Diff:
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
index 2fcaa9c..aa1ba27 100644
--- a/main/streams/plain_wrapper.c
+++ b/main/streams/plain_wrapper.c
@@ -170,8 +170,8 @@ static php_stream *_php_stream_fopen_from_fd_int(int fd, const char *mode, const
self->is_process_pipe = 0;
self->temp_name = NULL;
self->fd = fd;
-#ifndef PHP_WIN32
- is_pipe_blocking = 0;
+#ifdef PHP_WIN32
+ self->is_pipe_blocking = 0;
#endif
return php_stream_alloc_rel(&php_stream_stdio_ops, self, persistent_id, mode);
@@ -189,8 +189,8 @@ static php_stream *_php_stream_fopen_from_file_int(FILE *file, const char *mode
self->is_process_pipe = 0;
self->temp_name = NULL;
self->fd = fileno(file);
-#ifndef PHP_WIN32
- is_pipe_blocking = 0;
+#ifdef PHP_WIN32
+ self->is_pipe_blocking = 0;
#endif
return php_stream_alloc_rel(&php_stream_stdio_ops, self, 0, mode);
@@ -318,8 +318,8 @@ PHPAPI php_stream *_php_stream_fopen_from_pipe(FILE *file, const char *mode STRE
self->is_process_pipe = 1;
self->fd = fileno(file);
self->temp_name = NULL;
-#ifndef PHP_WIN32
- is_pipe_blocking = 0;
+#ifdef PHP_WIN32
+ self->is_pipe_blocking = 0;
#endif
stream = php_stream_alloc_rel(&php_stream_stdio_ops, self, 0, mode);