com php-src: Fix alignment on 32-bit: main/streams/plain_wrap per.c
| From: | Anatol Belski | Date: | Thu, 02 Jul 2015 12:23:07 +0000 |
| Subject: | com php-src: Fix alignment on 32-bit: main/streams/plain_wrap per.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87693@lists.php.net to get a copy of this message | ||
Commit: 58b982afed4f4a5c00190e81b229375bceabe8ab
Author: Christoph M. Becker <cmb@php.net> Thu, 2 Jul 2015 12:16:41 +0200
Committer: Anatol Belski <ab@php.net> Thu, 2 Jul 2015 14:23:07 +0200
Parents: a88c68f833efeee552fdcb255787eee680a7e76e
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=58b982afed4f4a5c00190e81b229375bceabe8ab
Log:
Fix alignment on 32-bit
Changed paths:
M main/streams/plain_wrapper.c
Diff:
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
index aa1ba27..8122a76 100644
--- a/main/streams/plain_wrapper.c
+++ b/main/streams/plain_wrapper.c
@@ -121,7 +121,8 @@ typedef struct {
unsigned is_process_pipe:1; /* use pclose instead of fclose */
unsigned is_pipe:1; /* don't try and seek */
unsigned cached_fstat:1; /* sb is valid */
- unsigned is_pipe_blocking;
+ unsigned is_pipe_blocking:1; /* allow blocking read() on pipes, currently Windows only */
+ unsigned _reserved:28;
int lock_flag; /* stores the lock state */
zend_string *temp_name; /* if non-null, this is the path to a temporary file that