1 files changed, 19 insertions, 19 deletions

diff --git a/main/streams/php_stream_context.h b/main/streams/php_stream_context.h
index c31f1fa984..25f5bb3f58 100644
--- a/main/streams/php_stream_context.h
+++ b/main/streams/php_stream_context.h
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | PHP Version 5                                                        |
+   | PHP Version 7                                                        |
    +----------------------------------------------------------------------+
    | Copyright (c) 1997-2015 The PHP Group                                |
    +----------------------------------------------------------------------+
@@ -25,7 +25,7 @@ typedef void (*php_stream_notification_func)(php_stream_context *context,
 		int notifycode, int severity,
 		char *xmsg, int xcode,
 		size_t bytes_sofar, size_t bytes_max,
-		void * ptr TSRMLS_DC);
+		void * ptr);
 
 #define PHP_STREAM_NOTIFIER_PROGRESS	1
 
@@ -33,34 +33,34 @@ typedef void (*php_stream_notification_func)(php_stream_context *context,
    If no context was passed, use the default context
    The default context has not yet been created, do it now. */
 #define php_stream_context_from_zval(zcontext, nocontext) ( \
-		(zcontext) ? zend_fetch_resource(&(zcontext) TSRMLS_CC, -1, "Stream-Context", NULL, 1, php_le_stream_context(TSRMLS_C)) : \
+		(zcontext) ? zend_fetch_resource_ex(zcontext, "Stream-Context", php_le_stream_context()) : \
 		(nocontext) ? NULL : \
 		FG(default_context) ? FG(default_context) : \
-		(FG(default_context) = php_stream_context_alloc(TSRMLS_C)) )
+		(FG(default_context) = php_stream_context_alloc()) )
 
-#define php_stream_context_to_zval(context, zval) { ZVAL_RESOURCE(zval, (context)->rsrc_id); zend_list_addref((context)->rsrc_id); }
+#define php_stream_context_to_zval(context, zval) { ZVAL_RES(zval, (context)->res); GC_REFCOUNT((context)->res)++; }
 
 typedef struct _php_stream_notifier php_stream_notifier;
 
 struct _php_stream_notifier {
 	php_stream_notification_func func;
 	void (*dtor)(php_stream_notifier *notifier);
-	void *ptr;
+	zval ptr;
 	int mask;
 	size_t progress, progress_max; /* position for progress notification */
 };
 
 struct _php_stream_context {
 	php_stream_notifier *notifier;
-	zval *options;	/* hash keyed by wrapper family or specific wrapper */
-	int rsrc_id;	/* used for auto-cleanup */
+	zval options;	/* hash keyed by wrapper family or specific wrapper */
+	zend_resource *res;	/* used for auto-cleanup */
 };
 
 BEGIN_EXTERN_C()
 PHPAPI void php_stream_context_free(php_stream_context *context);
-PHPAPI php_stream_context *php_stream_context_alloc(TSRMLS_D);
-PHPAPI int php_stream_context_get_option(php_stream_context *context,
-		const char *wrappername, const char *optionname, zval ***optionvalue);
+PHPAPI php_stream_context *php_stream_context_alloc(void);
+PHPAPI zval *php_stream_context_get_option(php_stream_context *context,
+		const char *wrappername, const char *optionname);
 PHPAPI int php_stream_context_set_option(php_stream_context *context,
 		const char *wrappername, const char *optionname, zval *optionvalue);
 
@@ -86,17 +86,17 @@ END_EXTERN_C()
 
 BEGIN_EXTERN_C()
 PHPAPI void php_stream_notification_notify(php_stream_context *context, int notifycode, int severity,
-		char *xmsg, int xcode, size_t bytes_sofar, size_t bytes_max, void * ptr TSRMLS_DC);
+		char *xmsg, int xcode, size_t bytes_sofar, size_t bytes_max, void * ptr);
 PHPAPI php_stream_context *php_stream_context_set(php_stream *stream, php_stream_context *context);
 END_EXTERN_C()
 
 #define php_stream_notify_info(context, code, xmsg, xcode)	do { if ((context) && (context)->notifier) { \
 	php_stream_notification_notify((context), (code), PHP_STREAM_NOTIFY_SEVERITY_INFO, \
-				(xmsg), (xcode), 0, 0, NULL TSRMLS_CC); } } while (0)
-			
+				(xmsg), (xcode), 0, 0, NULL); } } while (0)
+
 #define php_stream_notify_progress(context, bsofar, bmax) do { if ((context) && (context)->notifier) { \
 	php_stream_notification_notify((context), PHP_STREAM_NOTIFY_PROGRESS, PHP_STREAM_NOTIFY_SEVERITY_INFO, \
-			NULL, 0, (bsofar), (bmax), NULL TSRMLS_CC); } } while(0)
+			NULL, 0, (bsofar), (bmax), NULL); } } while(0)
 
 #define php_stream_notify_progress_init(context, sofar, bmax) do { if ((context) && (context)->notifier) { \
 	(context)->notifier->progress = (sofar); \
@@ -111,12 +111,12 @@ END_EXTERN_C()
 
 #define php_stream_notify_file_size(context, file_size, xmsg, xcode) do { if ((context) && (context)->notifier) { \
 	php_stream_notification_notify((context), PHP_STREAM_NOTIFY_FILE_SIZE_IS, PHP_STREAM_NOTIFY_SEVERITY_INFO, \
-			(xmsg), (xcode), 0, (file_size), NULL TSRMLS_CC); } } while(0)
-	
+			(xmsg), (xcode), 0, (file_size), NULL); } } while(0)
+
 #define php_stream_notify_error(context, code, xmsg, xcode) do { if ((context) && (context)->notifier) {\
 	php_stream_notification_notify((context), (code), PHP_STREAM_NOTIFY_SEVERITY_ERR, \
-			(xmsg), (xcode), 0, 0, NULL TSRMLS_CC); } } while(0)
-	
+			(xmsg), (xcode), 0, 0, NULL); } } while(0)
+
 
 /*
  * Local variables: