From 08b26382750ea0ad39b76323d1caf2497fd939ca Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sun, 5 Oct 2014 20:48:32 +0200 Subject: convert ext/sockets to work with the static tsrm cache pointer --- ext/sockets/php_sockets.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/sockets/php_sockets.h') diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h index b1ee5798c9..8a25f960a3 100644 --- a/ext/sockets/php_sockets.h +++ b/ext/sockets/php_sockets.h @@ -89,7 +89,7 @@ ZEND_BEGIN_MODULE_GLOBALS(sockets) ZEND_END_MODULE_GLOBALS(sockets) #ifdef ZTS -#define SOCKETS_G(v) TSRMG(sockets_globals_id, zend_sockets_globals *, v) +#define SOCKETS_G(v) ZEND_TSRMG(sockets_globals_id, zend_sockets_globals *, v) #else #define SOCKETS_G(v) (sockets_globals.v) #endif -- cgit v1.2.1 From bdeb220f48825642f84cdbf3ff23a30613c92e86 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 13 Dec 2014 23:06:14 +0100 Subject: first shot remove TSRMLS_* things --- ext/sockets/php_sockets.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ext/sockets/php_sockets.h') diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h index 98c36cd1ad..63638e23e3 100644 --- a/ext/sockets/php_sockets.h +++ b/ext/sockets/php_sockets.h @@ -71,7 +71,7 @@ struct sockaddr_un { PHP_SOCKETS_API int php_sockets_le_socket(void); PHP_SOCKETS_API php_socket *php_create_socket(void); -PHP_SOCKETS_API void php_destroy_socket(zend_resource *rsrc TSRMLS_DC); +PHP_SOCKETS_API void php_destroy_socket(zend_resource *rsrc); #define php_sockets_le_socket_name "Socket" @@ -81,7 +81,7 @@ PHP_SOCKETS_API void php_destroy_socket(zend_resource *rsrc TSRMLS_DC); (socket)->error = _err; \ SOCKETS_G(last_error) = _err; \ if (_err != EAGAIN && _err != EWOULDBLOCK && _err != EINPROGRESS) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s [%d]: %s", msg, _err, sockets_strerror(_err TSRMLS_CC)); \ + php_error_docref(NULL, E_WARNING, "%s [%d]: %s", msg, _err, sockets_strerror(_err)); \ } \ } while (0) @@ -104,8 +104,8 @@ enum sockopt_return { SOCKOPT_SUCCESS }; -char *sockets_strerror(int error TSRMLS_DC); -php_socket *socket_import_file_descriptor(PHP_SOCKET sock TSRMLS_DC); +char *sockets_strerror(int error); +php_socket *socket_import_file_descriptor(PHP_SOCKET sock); #else #define phpext_sockets_ptr NULL -- cgit v1.2.1