From 4c68e810183f6b02ce7c2731ddecb4aca14c87f3 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 14 Dec 2013 00:26:56 +0100 Subject: fixed sapi/embed --- sapi/embed/php_embed.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sapi/embed/php_embed.c') diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index 414b4dbb02..0ed475c065 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -44,10 +44,10 @@ static int php_embed_deactivate(TSRMLS_D) return SUCCESS; } -static inline size_t php_embed_single_write(const char *str, uint str_length) +static inline size_t php_embed_single_write(const char *str, zend_str_size_uint str_length) { #ifdef PHP_WRITE_STDOUT - long ret; + php_int_t ret; ret = write(STDOUT_FILENO, str, str_length); if (ret <= 0) return 0; @@ -61,10 +61,10 @@ static inline size_t php_embed_single_write(const char *str, uint str_length) } -static int php_embed_ub_write(const char *str, uint str_length TSRMLS_DC) +static zend_str_size_int php_embed_ub_write(const char *str, zend_str_size_uint str_length TSRMLS_DC) { const char *ptr = str; - uint remaining = str_length; + zend_str_size_uint remaining = str_length; size_t ret; while (remaining > 0) { -- cgit v1.2.1 From b1abe4ca21e10b04a8bae2d00e8113f4b2b02567 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 18 Dec 2013 14:46:44 -0800 Subject: mass replacement for zend_size_t/php_size_t --- 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 e1cf078f2d..929c19d79c 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, zend_str_size_uint str_length) +static inline size_t php_embed_single_write(const char *str, php_size_t str_length) { #ifdef PHP_WRITE_STDOUT php_int_t ret; @@ -61,10 +61,10 @@ static inline size_t php_embed_single_write(const char *str, zend_str_size_uint } -static zend_str_size_int php_embed_ub_write(const char *str, zend_str_size_uint str_length TSRMLS_DC) +static php_size_t php_embed_ub_write(const char *str, php_size_t str_length TSRMLS_DC) { const char *ptr = str; - zend_str_size_uint remaining = str_length; + php_size_t remaining = str_length; size_t ret; while (remaining > 0) { -- cgit v1.2.1 From fdbbe5fa30ce524d9b0a8b376561d598bf0eb80c Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 20 Aug 2014 09:52:23 +0200 Subject: fixed some incompatible types --- sapi/embed/php_embed.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sapi/embed/php_embed.c') diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index b4fc5aaf10..2f2f31fb85 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -44,10 +44,10 @@ static int php_embed_deactivate(TSRMLS_D) return SUCCESS; } -static inline size_t php_embed_single_write(const char *str, uint str_length) +static inline size_t php_embed_single_write(const char *str, php_size_t str_length) { #ifdef PHP_WRITE_STDOUT - long ret; + php_int_t ret; ret = write(STDOUT_FILENO, str, str_length); if (ret <= 0) return 0; @@ -61,10 +61,10 @@ static inline size_t php_embed_single_write(const char *str, uint str_length) } -static int php_embed_ub_write(const char *str, uint str_length TSRMLS_DC) +static php_size_t php_embed_ub_write(const char *str, php_size_t str_length TSRMLS_DC) { const char *ptr = str; - uint remaining = str_length; + php_size_t remaining = str_length; size_t ret; while (remaining > 0) { -- cgit v1.2.1 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