CVS update: php3/functions

Date: Friday January 8, 1999 @ 9:48 Author: martin Update of /repository/php3/functions In directory asf:/u/temp/cvs-serv558/functions Modified Files: microtime.c Log Message: Preprocessor #undef's of "function-like" macros must not include the parens. On BS2000, the rusage structure contains only a minimum set of fields; avoid access to invalid fields at compile time. Index: php3/functions/microtime.c diff -c php3/functions/microtime.c:1.26 php3/functions/microtime.c:1.27 *** php3/functions/microtime.c:1.26 Fri Jan 1 12:59:13 1999 --- php3/functions/microtime.c Fri Jan 8 09:48:01 1999 *************** *** 27,33 **** +----------------------------------------------------------------------+ */ ! /* $Id: microtime.c,v 1.26 1999/01/01 17:59:13 zeev Exp $ */ #include "php.h" #include <stdlib.h> --- 27,33 ---- +----------------------------------------------------------------------+ */ ! /* $Id: microtime.c,v 1.27 1999/01/08 14:48:01 martin Exp $ */ #include "php.h" #include <stdlib.h> *************** *** 129,134 **** --- 129,135 ---- array_init(return_value); #define PHP3_RUSAGE_PARA(a) \ add_assoc_long(return_value, #a, usg.a) + #ifndef _OSD_POSIX /* BS2000 has only a few fields in the rusage struct */ PHP3_RUSAGE_PARA(ru_oublock); PHP3_RUSAGE_PARA(ru_inblock); PHP3_RUSAGE_PARA(ru_msgsnd); *************** *** 141,151 **** PHP3_RUSAGE_PARA(ru_nsignals); PHP3_RUSAGE_PARA(ru_nvcsw); PHP3_RUSAGE_PARA(ru_nivcsw); PHP3_RUSAGE_PARA(ru_utime.tv_usec); PHP3_RUSAGE_PARA(ru_utime.tv_sec); PHP3_RUSAGE_PARA(ru_stime.tv_usec); PHP3_RUSAGE_PARA(ru_stime.tv_sec); ! #undef PHP3_RUSAGE_PARA(a) #endif /* HAVE_GETRUSAGE */ } /* }}} */ --- 142,153 ---- PHP3_RUSAGE_PARA(ru_nsignals); PHP3_RUSAGE_PARA(ru_nvcsw); PHP3_RUSAGE_PARA(ru_nivcsw); + #endif /*_OSD_POSIX*/ PHP3_RUSAGE_PARA(ru_utime.tv_usec); PHP3_RUSAGE_PARA(ru_utime.tv_sec); PHP3_RUSAGE_PARA(ru_stime.tv_usec); PHP3_RUSAGE_PARA(ru_stime.tv_sec); ! #undef PHP3_RUSAGE_PARA #endif /* HAVE_GETRUSAGE */ } /* }}} */ -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net