summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli_server.c
diff options
context:
space:
mode:
Diffstat (limited to 'sapi/cli/php_cli_server.c')
-rw-r--r--sapi/cli/php_cli_server.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 869c868edb..6e6c78fe5b 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -112,6 +112,8 @@
#define OUTPUT_IS_TTY 1
#define OUTPUT_NOT_TTY 0
+TSRMG_D(zend_cli_server_globals, cli_server_globals_id);
+
typedef struct php_cli_server_poller {
fd_set rfds, wfds;
struct {
@@ -515,7 +517,7 @@ zend_module_entry cli_server_module_entry = {
NULL,
PHP_MINFO(cli_server),
PHP_VERSION,
- STANDARD_MODULE_PROPERTIES_EX
+ STANDARD_MODULE_PROPERTIES
};
/* }}} */
@@ -2353,7 +2355,7 @@ static int php_cli_server_send_event(php_cli_server *server, php_cli_server_clie
/* }}} */
typedef struct php_cli_server_do_event_for_each_fd_callback_params {
-#ifdef ZTS
+#ifdef PASS_TSRMLS
void ***tsrm_ls;
#endif
php_cli_server *server;