diff options
| author | Michael Wallner <mike@php.net> | 2013-09-17 10:50:49 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2013-09-17 10:50:49 +0200 |
| commit | 1c15d70cbd91e3f502694a31704e959cf734d8da (patch) | |
| tree | 922fc946cf4c9a151e268a7adea06a6a4f86ce2a /main/php_streams.h | |
| parent | 52ff129607a7193cccbc6bdfbf1c1e8586e8d0d2 (diff) | |
| parent | 2438490addfbfba51e12246a74588b2382caa08a (diff) | |
| download | php-git-1c15d70cbd91e3f502694a31704e959cf734d8da.tar.gz | |
Merge branch 'slim-postdata'
* slim-postdata:
slim post data
add NEWS entry; add simple test
more precise condition
make this work in vc11 too
Use int64_t and atoll() after discussion with johannes
ws
Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
Diffstat (limited to 'main/php_streams.h')
| -rw-r--r-- | main/php_streams.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/php_streams.h b/main/php_streams.h index c56014c62e..c9732b4848 100644 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -242,7 +242,7 @@ PHPAPI php_stream *_php_stream_alloc(php_stream_ops *ops, void *abstract, END_EXTERN_C() #define php_stream_alloc(ops, thisptr, persistent_id, mode) _php_stream_alloc((ops), (thisptr), (persistent_id), (mode) STREAMS_CC TSRMLS_CC) -#define php_stream_get_resource_id(stream) (stream)->rsrc_id +#define php_stream_get_resource_id(stream) ((php_stream *)(stream))->rsrc_id #if ZEND_DEBUG /* use this to tell the stream that it is OK if we don't explicitly close it */ # define php_stream_auto_cleanup(stream) { (stream)->__exposed++; } |