From c3e3c98ec666812daaaca896cf5ef758a8a6df14 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 25 Aug 2014 19:24:55 +0200 Subject: master renames phase 1 --- sapi/embed/php_embed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sapi/embed/php_embed.c') diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index 2f2f31fb85..8f2e9be312 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -47,7 +47,7 @@ static int php_embed_deactivate(TSRMLS_D) static inline size_t php_embed_single_write(const char *str, php_size_t str_length) { #ifdef PHP_WRITE_STDOUT - php_int_t ret; + zend_long ret; ret = write(STDOUT_FILENO, str, str_length); if (ret <= 0) return 0; -- cgit v1.2.1 From 4d997f63d98c663b2d9acccd3655572652f61c7d Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 25 Aug 2014 20:22:49 +0200 Subject: master renames phase 3 --- sapi/embed/php_embed.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sapi/embed/php_embed.c') diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index 8f2e9be312..230b3a649d 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -44,7 +44,7 @@ static int php_embed_deactivate(TSRMLS_D) return SUCCESS; } -static inline size_t php_embed_single_write(const char *str, php_size_t str_length) +static inline size_t php_embed_single_write(const char *str, size_t str_length) { #ifdef PHP_WRITE_STDOUT zend_long ret; @@ -61,10 +61,10 @@ static inline size_t php_embed_single_write(const char *str, php_size_t str_leng } -static php_size_t php_embed_ub_write(const char *str, php_size_t str_length TSRMLS_DC) +static size_t php_embed_ub_write(const char *str, size_t str_length TSRMLS_DC) { const char *ptr = str; - php_size_t remaining = str_length; + size_t remaining = str_length; size_t ret; while (remaining > 0) { -- cgit v1.2.1 From d0cb715373c3fbe9dc095378ec5ed8c71f799f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= Date: Fri, 19 Sep 2014 18:33:14 +0200 Subject: s/PHP 5/PHP 7/ --- sapi/embed/php_embed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sapi/embed/php_embed.c') diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index 230b3a649d..e0df666108 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ -- cgit v1.2.1