stas 2002/07/10 23:14:10
Modified: xs typemap
xs/Apache/SubProcess Apache__SubProcess.h
Log:
use the new time conversion macros: apr_time_*
Revision Changes Path
1.9 +2 -2 modperl-2.0/xs/typemap
Index: typemap
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/typemap,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- typemap 24 May 2002 04:42:57 -0000 1.8
+++ typemap 11 Jul 2002 06:14:10 -0000 1.9
@@ -15,7 +15,7 @@
sv_setiv($arg, PTR2IV($var));
T_APR_TIME
- sv_setnv($arg, (NV)($var / APR_USEC_PER_SEC));
+ sv_setnv($arg, (NV)(apr_time_sec($var)));
T_UVOBJ
modperl_perl_sv_setref_uv(aTHX_ $arg, \"${ntype}\", (UV)$var);
@@ -58,7 +58,7 @@
$var = INT2PTR($type,SvIV(SvROK($arg) ? SvRV($arg) : $arg))
T_APR_TIME
- $var = (apr_time_t)(SvNV($arg) * APR_USEC_PER_SEC)
+ $var = (apr_time_t)(apr_time_from_sec(SvNV($arg)))
T_CHAR_LEN
$var = (char *)SvPV($arg, ${var}_len)
1.11 +1 -1 modperl-2.0/xs/Apache/SubProcess/Apache__SubProcess.h
Index: Apache__SubProcess.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/Apache/SubProcess/Apache__SubProcess.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Apache__SubProcess.h 15 Mar 2002 04:29:25 -0000 1.10
+++ Apache__SubProcess.h 11 Jul 2002 06:14:10 -0000 1.11
@@ -20,7 +20,7 @@
#define SET_TIMEOUT(fp) \
apr_file_pipe_timeout_set(fp, \
- (int)(r->server->timeout * APR_USEC_PER_SEC))
+ (int)(apr_time_from_sec(r->server->timeout)))
static int modperl_spawn_proc_prog(pTHX_
request_rec *r,
