X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_client_datashare.h;h=8e66b68d8e1a10bbcde9cc6a3689ba75c0b060ca;hp=fb3fc5542c983a8efb6a369a43139dd457f7b942;hb=5855b4ed57714dabea33a2c57d4b9cb1a03af70c;hpb=a18e662d5ff2c4e7051e028f8002dbba720cccd6

diff --git a/php_http_client_datashare.h b/php_http_client_datashare.h
index fb3fc55..8e66b68 100644
--- a/php_http_client_datashare.h
+++ b/php_http_client_datashare.h
@@ -28,7 +28,7 @@ typedef STATUS (*php_http_client_datashare_detach_func_t)(struct php_http_client
 typedef STATUS (*php_http_client_datashare_setopt_func_t)(struct php_http_client_datashare *h, php_http_client_datashare_setopt_opt_t opt, void *arg);
 
 typedef struct php_http_client_datashare_ops {
-	php_http_resource_factory_ops_t *rsrc;
+	php_resource_factory_ops_t *rsrc;
 	php_http_client_datashare_init_func_t init;
 	php_http_client_datashare_copy_func_t copy;
 	php_http_client_datashare_dtor_func_t dtor;
@@ -42,7 +42,7 @@ typedef struct php_http_client_datashare_ops {
 
 typedef struct php_http_client_datashare {
 	void *ctx;
-	php_http_resource_factory_t *rf;
+	php_resource_factory_t *rf;
 	php_http_client_datashare_ops_t *ops;
 	zend_llist clients;
 #ifdef ZTS
@@ -50,9 +50,9 @@ typedef struct php_http_client_datashare {
 #endif
 } php_http_client_datashare_t;
 
-extern PHP_MINIT_FUNCTION(http_client_datashare);
+PHP_MINIT_FUNCTION(http_client_datashare);
 
-PHP_HTTP_API php_http_client_datashare_t *php_http_client_datashare_init(php_http_client_datashare_t *h, php_http_client_datashare_ops_t *ops, php_http_resource_factory_t *rf, void *init_arg TSRMLS_DC);
+PHP_HTTP_API php_http_client_datashare_t *php_http_client_datashare_init(php_http_client_datashare_t *h, php_http_client_datashare_ops_t *ops, php_resource_factory_t *rf, void *init_arg TSRMLS_DC);
 PHP_HTTP_API php_http_client_datashare_t *php_http_client_datashare_copy(php_http_client_datashare_t *from, php_http_client_datashare_t *to);
 PHP_HTTP_API void php_http_client_datashare_dtor(php_http_client_datashare_t *h);
 PHP_HTTP_API void php_http_client_datashare_free(php_http_client_datashare_t **h);
@@ -66,14 +66,12 @@ typedef struct php_http_client_datashare_object {
 	php_http_client_datashare_t *share;
 } php_http_client_datashare_object_t;
 
-extern zend_class_entry *php_http_client_datashare_class_entry;
-extern zend_function_entry php_http_client_datashare_method_entry[];
+zend_object_value php_http_client_datashare_object_new(zend_class_entry *ce TSRMLS_DC);
+zend_object_value php_http_client_datashare_object_new_ex(zend_class_entry *ce, php_http_client_datashare_t *share, php_http_client_datashare_object_t **ptr TSRMLS_DC);
+void php_http_client_datashare_object_free(void *object TSRMLS_DC);
 
-extern zend_object_value php_http_client_datashare_object_new(zend_class_entry *ce TSRMLS_DC);
-extern zend_object_value php_http_client_datashare_object_new_ex(zend_class_entry *ce, php_http_client_datashare_t *share, php_http_client_datashare_object_t **ptr TSRMLS_DC);
-extern void php_http_client_datashare_object_free(void *object TSRMLS_DC);
-
-extern zend_object_handlers *php_http_client_datashare_get_object_handlers(void);
+zend_class_entry *php_http_client_datashare_get_class_entry();
+zend_object_handlers *php_http_client_datashare_get_object_handlers(void);
 
 PHP_METHOD(HttpClientDataShare, __destruct);
 PHP_METHOD(HttpClientDataShare, count);