Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE

1 files changed, 6 insertions, 6 deletions

diff --git a/Zend/zend_stream.h b/Zend/zend_stream.h
index 84dc2e00b8..7009e9cf01 100644
--- a/Zend/zend_stream.h
+++ b/Zend/zend_stream.h
@@ -30,9 +30,9 @@
 /* Lightweight stream implementation for the ZE scanners.
  * These functions are private to the engine.
  * */
-typedef size_t (*zend_stream_fsizer_t)(void* handle TSRMLS_DC);
-typedef size_t (*zend_stream_reader_t)(void* handle, char *buf, size_t len TSRMLS_DC);
-typedef void   (*zend_stream_closer_t)(void* handle TSRMLS_DC);
+typedef size_t (*zend_stream_fsizer_t)(void* handle);
+typedef size_t (*zend_stream_reader_t)(void* handle, char *buf, size_t len);
+typedef void   (*zend_stream_closer_t)(void* handle);
 
 #define ZEND_MMAP_AHEAD 32 
 
@@ -75,9 +75,9 @@ typedef struct _zend_file_handle {
 } zend_file_handle;
 
 BEGIN_EXTERN_C()
-ZEND_API int zend_stream_open(const char *filename, zend_file_handle *handle TSRMLS_DC);
-ZEND_API int zend_stream_fixup(zend_file_handle *file_handle, char **buf, size_t *len TSRMLS_DC);
-ZEND_API void zend_file_handle_dtor(zend_file_handle *fh TSRMLS_DC);
+ZEND_API int zend_stream_open(const char *filename, zend_file_handle *handle);
+ZEND_API int zend_stream_fixup(zend_file_handle *file_handle, char **buf, size_t *len);
+ZEND_API void zend_file_handle_dtor(zend_file_handle *fh);
 ZEND_API int zend_compare_file_handles(zend_file_handle *fh1, zend_file_handle *fh2);
 END_EXTERN_C()