further tsrm cleanup

diff --git a/sapi/pi3web/pi3web_sapi.c b/sapi/pi3web/pi3web_sapi.c
index 99f48d2be16f4971d1844837c2fd595cd96b618e..cba147a7c2cca38f77d543de3f9ec8bd00fb867c 100644 (file)
--- a/sapi/pi3web/pi3web_sapi.c
+++ b/sapi/pi3web/pi3web_sapi.c
@@ -180,7 +180,6 @@ static int sapi_pi3web_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
        char *combined_headers, *combined_headers_ptr;
        LPCONTROL_BLOCK lpCB = (LPCONTROL_BLOCK) SG(server_context);
        sapi_header_struct default_content_type;
-       TSRMLS_FETCH();
        
        if ( !IWasLoaded ) return SAPI_HEADER_SENT_SUCCESSFULLY;
 
@@ -320,7 +319,7 @@ static void init_request_info(sapi_globals_struct *sapi_globals, LPCONTROL_BLOCK
        SG(sapi_headers).http_response_code = 200;
 }
 
-static void hash_pi3web_variables(TSRMLS_D TSRMLS_DC)
+static void hash_pi3web_variables(TSRMLS_D)
 {
        char static_variable_buf[PI3WEB_SERVER_VAR_BUF_SIZE];
        char *variable_buf;

diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c
index 92c34b1a17d535f33df6b3806acd93b9768dacc1..969836ceecb6dd80c3d4ffb756417dd26d1a003e 100644 (file)
--- a/sapi/thttpd/thttpd.c
+++ b/sapi/thttpd/thttpd.c
@@ -260,7 +260,7 @@ static void thttpd_module_main(TSRMLS_D)
        php_request_shutdown(NULL);
 }
 
-static void thttpd_request_ctor(TSRMLS_D TSRMLS_DC)
+static void thttpd_request_ctor(TSRMLS_D)
 {
        int offset;
        smart_str s = {0};
@@ -295,7 +295,7 @@ static void thttpd_request_ctor(TSRMLS_D TSRMLS_DC)
        }
 }
 
-static void thttpd_request_dtor(TSRMLS_D TSRMLS_DC)
+static void thttpd_request_dtor(TSRMLS_D)
 {
        if (SG(request_info).query_string)
                free(SG(request_info).query_string);