CVS update: php3

Date: Friday July 2, 1999 @ 16:34 Author: markonen Update of /repository/php3 In directory php:/tmp/cvs-serv25308 Modified Files: configure.in internal_functions.c Log Message: Rollback on some dangerous casts (my bad), implement a more (though not quite) elegant solution for Mac OS X support. Index: php3/configure.in diff -u php3/configure.in:1.426 php3/configure.in:1.427 --- php3/configure.in:1.426 Fri Jul 2 12:41:50 1999 +++ php3/configure.in Fri Jul 2 16:34:42 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.426 1999/07/02 16:41:50 markonen Exp $ +dnl $Id: configure.in,v 1.427 1999/07/02 20:34:42 markonen Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -50,6 +50,12 @@ APXS_EXP="-bE:mod_php3.exp" fi AC_SUBST(APXS_EXP) + +dnl Hack to work around a Mac OS X cpp problem +dnl Known versions needing this workaround are 5.3 and 5.4 +if test "$ac_cv_prog_gcc" = "yes" -a "uname -s" = "Rhapsody"; then + CPPFLAGS="$CPPFLAGS -traditional-cpp" +fi dnl check for -R, etc. switch AC_MSG_CHECKING(if compiler supports -R) Index: php3/internal_functions.c diff -u php3/internal_functions.c:1.353 php3/internal_functions.c:1.354 --- php3/internal_functions.c:1.353 Fri Jul 2 12:41:50 1999 +++ php3/internal_functions.c Fri Jul 2 16:34:42 1999 @@ -29,7 +29,7 @@ */ -/* $Id: internal_functions.c,v 1.353 1999/07/02 16:41:50 markonen Exp $ */ +/* $Id: internal_functions.c,v 1.354 1999/07/02 20:34:42 markonen Exp $ */ #ifdef THREAD_SAFE #include "tls.h" @@ -641,9 +641,7 @@ { TLS_VARS; if (module->type == MODULE_TEMPORARY) { - void *mod; - mod = (void *) module->module_number; - _php3_hash_apply_with_argument(&GLOBAL(list_destructors), (int (*)(void *,void *)) clean_module_resource_destructors, &mod); + _php3_hash_apply_with_argument(&GLOBAL(list_destructors), (int (*)(void *,void *)) clean_module_resource_destructors, (void *) &(module->module_number)); clean_module_constants(module->module_number); } @@ -651,14 +649,14 @@ #if 0 php3_printf("%s: Request shutdown\n",module->name); #endif - (php3_module_entry *) module->request_shutdown_func(); + module->request_shutdown_func(); } module->request_started=0; if (module->module_started && module->module_shutdown_func) { #if 0 php3_printf("%s: Module shutdown\n",module->name); #endif - (php3_module_entry *) module->module_shutdown_func(); + module->module_shutdown_func(); } module->module_started=0; unregister_functions(module->functions,-1); @@ -678,7 +676,7 @@ #if 0 php3_printf("%s: Request startup\n",module->name); #endif - (php3_module_entry *) module->request_startup_func(module->type, module->module_number); + module->request_startup_func(module->type, module->module_number); } module->request_started=1; return 0; @@ -696,7 +694,7 @@ #if 0 php3_printf("%s: Request shutdown\n",module->name); #endif - (php3_module_entry *) module->request_shutdown_func(); + module->request_shutdown_func(); } module->request_started=0; return 0;