Even more TSRM cleanup.

diff --git a/sapi/caudium/caudium.c b/sapi/caudium/caudium.c
index 1a357b84d427ea86fad707e173980cd3e86dac52..5ef8b3125b5b5d61f783616bd03426489433d8d7 100644 (file)
--- a/sapi/caudium/caudium.c
+++ b/sapi/caudium/caudium.c
@@ -474,7 +474,7 @@ static zend_module_entry php_caudium_module = {
 };
 
 
-INLINE static void low_sapi_caudium_register_variables(zval *track_vars_array TSRMLS_DC TSRMLS_DC TSRMLS_DC)   
+INLINE static void low_sapi_caudium_register_variables(zval *track_vars_array TSRMLS_DC)   
 {
   char *tmp;
   php_register_variable("PHP_SELF", SG(request_info).request_uri,

diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c
index 831f52f442bc04f2449ce4e4ccade4bfd17ce8d2..92c34b1a17d535f33df6b3806acd93b9768dacc1 100644 (file)
--- a/sapi/thttpd/thttpd.c
+++ b/sapi/thttpd/thttpd.c
@@ -441,7 +441,7 @@ static void *worker_thread(void *dummy)
 
                thread_atomic_dec(nr_free_threads);
 
-               thttpd_real_php_request(hc TSRMLS_CC TSRMLS_CC);
+               thttpd_real_php_request(hc TSRMLS_CC);
                shutdown(hc->conn_fd, 0);
                destroy_conn(hc);
                free(hc);
@@ -480,7 +480,7 @@ static void remove_dead_conn(int fd)
 
 #endif
 
-static off_t thttpd_real_php_request(httpd_conn *hc TSRMLS_DC TSRMLS_DC)
+static off_t thttpd_real_php_request(httpd_conn *hc TSRMLS_DC)
 {
        TG(hc) = hc;
        hc->bytes_sent = 0;