1 files changed, 18 insertions, 18 deletions

diff --git a/main/output.c b/main/output.c
index 41b2c65cdf..b51892c140 100644
--- a/main/output.c
+++ b/main/output.c
@@ -519,7 +519,7 @@ PHPAPI php_output_handler *php_output_handler_create_user(zval *output_handler,
 				efree(error);
 			}
 			if (handler_name) {
-				STR_RELEASE(handler_name);
+				zend_string_release(handler_name);
 			}
 	}
 
@@ -532,11 +532,11 @@ PHPAPI php_output_handler *php_output_handler_create_user(zval *output_handler,
 PHPAPI php_output_handler *php_output_handler_create_internal(const char *name, size_t name_len, php_output_handler_context_func_t output_handler, size_t chunk_size, int flags TSRMLS_DC)
 {
 	php_output_handler *handler;
-	zend_string *str = STR_INIT(name, name_len, 1);
+	zend_string *str = zend_string_init(name, name_len, 1);
 
 	handler = php_output_handler_init(str, chunk_size, (flags & ~0xf) | PHP_OUTPUT_HANDLER_INTERNAL TSRMLS_CC);
 	handler->func.internal = output_handler;
-	STR_RELEASE(str);
+	zend_string_release(str);
 
 	return handler;
 }
@@ -718,7 +718,7 @@ PHPAPI int php_output_handler_hook(php_output_handler_hook_t type, void *arg TSR
 PHPAPI void php_output_handler_dtor(php_output_handler *handler TSRMLS_DC)
 {
 	if (handler->name) {
-		STR_RELEASE(handler->name);
+		zend_string_release(handler->name);
 	}
 	if (handler->buffer.data) {
 		efree(handler->buffer.data);
@@ -885,7 +885,7 @@ static inline php_output_handler *php_output_handler_init(zend_string *name, siz
 	php_output_handler *handler;
 
 	handler = ecalloc(1, sizeof(php_output_handler));
-	handler->name = STR_COPY(name);
+	handler->name = zend_string_copy(name);
 	handler->size = chunk_size;
 	handler->flags = flags;
 	handler->buffer.size = PHP_OUTPUT_HANDLER_INITBUF_SIZE(chunk_size);
@@ -973,7 +973,7 @@ static inline php_output_handler_status_t php_output_handler_op(php_output_handl
 			zval retval, ob_data, ob_mode;
 
 			ZVAL_STRINGL(&ob_data, handler->buffer.data, handler->buffer.used);
-			ZVAL_LONG(&ob_mode, (long) context->op);
+			ZVAL_LONG(&ob_mode, (zend_long) context->op);
 			zend_fcall_info_argn(&handler->func.user->fci TSRMLS_CC, 2, &ob_data, &ob_mode);
 
 #define PHP_OUTPUT_USER_SUCCESS(retval) ((Z_TYPE(retval) != IS_UNDEF) && !(Z_TYPE(retval) == IS_FALSE))
@@ -1172,7 +1172,7 @@ static int php_output_stack_apply_list(void *h, void *z)
 	php_output_handler *handler = *(php_output_handler **) h;
 	zval *array = (zval *) z;
 
-	add_next_index_str(array, STR_COPY(handler->name));
+	add_next_index_str(array, zend_string_copy(handler->name));
 	return 0;
 }
 /* }}} */
@@ -1196,13 +1196,13 @@ static inline zval *php_output_handler_status(php_output_handler *handler, zval
 	ZEND_ASSERT(entry != NULL);
 
 	array_init(entry);
-	add_assoc_str(entry, "name", STR_COPY(handler->name));
-	add_assoc_long(entry, "type", (long) (handler->flags & 0xf));
-	add_assoc_long(entry, "flags", (long) handler->flags);
-	add_assoc_long(entry, "level", (long) handler->level);
-	add_assoc_long(entry, "chunk_size", (long) handler->size);
-	add_assoc_long(entry, "buffer_size", (long) handler->buffer.size);
-	add_assoc_long(entry, "buffer_used", (long) handler->buffer.used);
+	add_assoc_str(entry, "name", zend_string_copy(handler->name));
+	add_assoc_long(entry, "type", (zend_long) (handler->flags & 0xf));
+	add_assoc_long(entry, "flags", (zend_long) handler->flags);
+	add_assoc_long(entry, "level", (zend_long) handler->level);
+	add_assoc_long(entry, "chunk_size", (zend_long) handler->size);
+	add_assoc_long(entry, "buffer_size", (zend_long) handler->buffer.size);
+	add_assoc_long(entry, "buffer_used", (zend_long) handler->buffer.used);
 
 	return entry;
 }
@@ -1316,8 +1316,8 @@ static int php_output_handler_devnull_func(void **handler_context, php_output_co
 PHP_FUNCTION(ob_start)
 {
 	zval *output_handler = NULL;
-	long chunk_size = 0;
-	long flags = PHP_OUTPUT_HANDLER_STDFLAGS;
+	zend_long chunk_size = 0;
+	zend_long flags = PHP_OUTPUT_HANDLER_STDFLAGS;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z/ll", &output_handler, &chunk_size, &flags) == FAILURE) {
 		return;
@@ -1539,7 +1539,7 @@ PHP_FUNCTION(ob_get_status)
    Turn implicit flush on/off and is equivalent to calling flush() after every output call */
 PHP_FUNCTION(ob_implicit_flush)
 {
-	long flag = 1;
+	zend_long flag = 1;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &flag) == FAILURE) {
 		return;
@@ -1566,7 +1566,7 @@ PHP_FUNCTION(output_reset_rewrite_vars)
 PHP_FUNCTION(output_add_rewrite_var)
 {
 	char *name, *value;
-	int name_len, value_len;
+	size_t name_len, value_len;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &name, &name_len, &value, &value_len) == FAILURE) {
 		return;