[PHP-CVS] cvs: php4 /main SAPI.h main.c

[Sebastian Bergmann]

sebastian               Mon Nov 18 01:04:06 2002 EDT

  Modified files:              
    /php4/main  SAPI.h main.c 
  Log:
  Fix ZTS build.
  
  
Index: php4/main/SAPI.h
diff -u php4/main/SAPI.h:1.88 php4/main/SAPI.h:1.89
--- php4/main/SAPI.h:1.88       Sun Nov 17 19:59:23 2002
+++ php4/main/SAPI.h    Mon Nov 18 01:04:06 2002
@@ -184,6 +184,7 @@
 SAPI_API char *sapi_get_default_content_type(TSRMLS_D);
 SAPI_API void sapi_get_default_content_type_header(sapi_header_struct *default_header 
TSRMLS_DC);
 SAPI_API size_t sapi_apply_default_charset(char **mimetype, size_t len TSRMLS_DC);
+SAPI_API void sapi_activate_headers_only(TSRMLS_D);
 
 struct _sapi_module_struct {
        char *name;
Index: php4/main/main.c
diff -u php4/main/main.c:1.515 php4/main/main.c:1.516
--- php4/main/main.c:1.515      Sun Nov 17 19:59:23 2002
+++ php4/main/main.c    Mon Nov 18 01:04:06 2002
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.515 2002/11/18 00:59:23 gschlossnagle Exp $ */
+/* $Id: main.c,v 1.516 2002/11/18 06:04:06 sebastian Exp $ */
 
 /* {{{ includes
  */
@@ -813,7 +813,7 @@
 
 /* {{{ php_start_sapi()
  */
-static int php_start_sapi()
+static int php_start_sapi(TSRMLS_D)
 {
     int retval = SUCCESS;
 
@@ -940,7 +940,7 @@
     signal(SIGCHLD, sigchld_handler);
 #endif
 
-    if (php_start_sapi() == FAILURE)
+    if (php_start_sapi(TSRMLS_C) == FAILURE)
         return FAILURE;
 
     php_output_activate(TSRMLS_C);
@@ -991,7 +991,7 @@
     } zend_end_try();
 
     zend_try {
-        shutdown_memory_manager(CG(unclean_shutdown), 0);
+        shutdown_memory_manager(CG(unclean_shutdown), 0 TSRMLS_CC);
     } zend_end_try();
 
     zend_try {



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php