com php-src: Renamed struct member: main/php_output.h
| From: | JulienPauli | Date: | Mon, 17 Aug 2015 14:25:03 +0000 |
| Subject: | com php-src: Renamed struct member: main/php_output.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88561@lists.php.net to get a copy of this message | ||
Commit: 5f54027d045fe00c5dc662310d48933b56c2f9ae
Author: Julien Pauli <jpauli@php.net> Mon, 17 Aug 2015 16:24:38 +0200
Parents: ce89fd9758fffd6c4bffca130829734ac3fca8ec
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5f54027d045fe00c5dc662310d48933b56c2f9ae
Log:
Renamed struct member
<resolv.h> has a #define for _res which makes compilation
fail if included before php_output.h
Changed paths:
M main/php_output.h
Diff:
diff --git a/main/php_output.h b/main/php_output.h
index 34c3445..4950c8d 100644
--- a/main/php_output.h
+++ b/main/php_output.h
@@ -95,7 +95,7 @@ typedef struct _php_output_buffer {
size_t size;
size_t used;
uint free:1;
- uint _res:31;
+ uint _reserved:31;
} php_output_buffer;
typedef struct _php_output_context {