summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2015-08-17 16:24:38 +0200
committerJulien Pauli <jpauli@php.net>2015-08-17 16:25:03 +0200
commit5f54027d045fe00c5dc662310d48933b56c2f9ae (patch)
treef33ede3ed8a8000c3e76cfdf9df087709e7be4e4 /main
parentce89fd9758fffd6c4bffca130829734ac3fca8ec (diff)
downloadphp-git-5f54027d045fe00c5dc662310d48933b56c2f9ae.tar.gz
Renamed struct member
<resolv.h> has a #define for _res which makes compilation fail if included before php_output.h
Diffstat (limited to 'main')
-rw-r--r--main/php_output.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/php_output.h b/main/php_output.h
index 34c344534c..4950c8d3a2 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 {