1 files changed, 20 insertions, 19 deletions

diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c
index 8bfaf9f52d..f5e6129e0f 100644
--- a/sapi/embed/php_embed.c
+++ b/sapi/embed/php_embed.c
@@ -33,12 +33,16 @@ const char HARDCODED_INI[] =
 	"max_execution_time=0\n"
 	"max_input_time=-1\n\0";
 
-static char* php_embed_read_cookies(TSRMLS_D)
+#if defined(PHP_WIN32) && defined(ZTS)
+ZEND_TSRMLS_CACHE_DEFINE;
+#endif
+
+static char* php_embed_read_cookies(void)
 {
 	return NULL;
 }
 
-static int php_embed_deactivate(TSRMLS_D)
+static int php_embed_deactivate(void)
 {
 	fflush(stdout);
 	return SUCCESS;
@@ -61,7 +65,7 @@ static inline size_t php_embed_single_write(const char *str, size_t str_length)
 }
 
 
-static size_t php_embed_ub_write(const char *str, size_t str_length TSRMLS_DC)
+static size_t php_embed_ub_write(const char *str, size_t str_length)
 {
 	const char *ptr = str;
 	size_t remaining = str_length;
@@ -79,25 +83,25 @@ static size_t php_embed_ub_write(const char *str, size_t str_length TSRMLS_DC)
 	return str_length;
 }
 
-static void php_embed_flush(void *server_context TSRMLS_DC)
+static void php_embed_flush(void *server_context)
 {
 	if (fflush(stdout)==EOF) {
 		php_handle_aborted_connection();
 	}
 }
 
-static void php_embed_send_header(sapi_header_struct *sapi_header, void *server_context TSRMLS_DC)
+static void php_embed_send_header(sapi_header_struct *sapi_header, void *server_context)
 {
 }
 
-static void php_embed_log_message(char *message TSRMLS_DC)
+static void php_embed_log_message(char *message)
 {
 	fprintf (stderr, "%s\n", message);
 }
 
-static void php_embed_register_variables(zval *track_vars_array TSRMLS_DC)
+static void php_embed_register_variables(zval *track_vars_array)
 {
-	php_import_environment_variables(track_vars_array TSRMLS_CC);
+	php_import_environment_variables(track_vars_array);
 }
 
 static int php_embed_startup(sapi_module_struct *sapi_module)
@@ -152,12 +156,9 @@ static const zend_function_entry additional_functions[] = {
 	{NULL, NULL, NULL}
 };
 
-EMBED_SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC)
+EMBED_SAPI_API int php_embed_init(int argc, char **argv)
 {
 	zend_llist global_vars;
-#ifdef ZTS
-	void ***tsrm_ls = NULL;
-#endif
 
 #ifdef HAVE_SIGNAL_H
 #if defined(SIGPIPE) && defined(SIG_IGN)
@@ -172,8 +173,8 @@ EMBED_SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC)
 
 #ifdef ZTS
   tsrm_startup(1, 1, 0, NULL);
-  tsrm_ls = ts_resource(0);
-  *ptsrm_ls = tsrm_ls;
+  (void)ts_resource(0);
+  ZEND_TSRMLS_CACHE_UPDATE;
 #endif
 
   sapi_startup(&php_embed_module);
@@ -205,22 +206,22 @@ EMBED_SAPI_API int php_embed_init(int argc, char **argv PTSRMLS_DC)
   SG(request_info).argc=argc;
   SG(request_info).argv=argv;
 
-  if (php_request_startup(TSRMLS_C)==FAILURE) {
-	  php_module_shutdown(TSRMLS_C);
+  if (php_request_startup()==FAILURE) {
+	  php_module_shutdown();
 	  return FAILURE;
   }
   
   SG(headers_sent) = 1;
   SG(request_info).no_headers = 1;
-  php_register_variable("PHP_SELF", "-", NULL TSRMLS_CC);
+  php_register_variable("PHP_SELF", "-", NULL);
 
   return SUCCESS;
 }
 
-EMBED_SAPI_API void php_embed_shutdown(TSRMLS_D)
+EMBED_SAPI_API void php_embed_shutdown(void)
 {
 	php_request_shutdown((void *) 0);
-	php_module_shutdown(TSRMLS_C);
+	php_module_shutdown();
 	sapi_shutdown();
 #ifdef ZTS
     tsrm_shutdown();