From 6f9f0bf2056f0dc17d9bcc6dd3b7d28ac878c6fc Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 25 Aug 2014 19:28:33 +0200 Subject: master renames phase 2 --- ext/curl/php_curl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/curl/php_curl.h') diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index e82fd3f38b..c75d7f80d1 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -179,7 +179,7 @@ typedef struct { php_curl_handlers *handlers; zend_resource *res; zend_bool in_callback; - zend_uint clone; + uint32_t clone; zend_bool safe_upload; } php_curl; -- 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/ --- ext/curl/php_curl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/curl/php_curl.h') diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index c75d7f80d1..cc96a410f3 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ -- cgit v1.2.1 From e33f3d3b7c9a69fe069484045a27d282aa98b00e Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 20 Sep 2014 22:42:02 +0200 Subject: Move smart_str implementation into Zend/ So we can use it there as well... For now I've retained the zend_smart_str_public.h header, though it would probably be better to just move that one struct into zend_types.h. --- ext/curl/php_curl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/curl/php_curl.h') diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index cc96a410f3..665682c23a 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -23,7 +23,7 @@ #define _PHP_CURL_H #include "php.h" -#include "ext/standard/php_smart_str.h" +#include "zend_smart_str_public.h" #ifdef COMPILE_DL_CURL #undef HAVE_CURL -- cgit v1.2.1 From a770d29df74515197c76efdf1a64d9794c27b4af Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sun, 21 Sep 2014 20:47:07 +0200 Subject: Add smart_str_append for appending zend_strings Also replaces usages in Zend/ and ext/standard --- ext/curl/php_curl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/curl/php_curl.h') diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index 665682c23a..ad44ae7b96 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -23,7 +23,7 @@ #define _PHP_CURL_H #include "php.h" -#include "zend_smart_str_public.h" +#include "zend_smart_str.h" #ifdef COMPILE_DL_CURL #undef HAVE_CURL -- cgit v1.2.1