summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.in3
-rw-r--r--win32/win32.c12
3 files changed, 14 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index c39119037b..c3c9627b1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Aug 15 16:08:40 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
+
+ * configure.in: add ac_cv_func_times=yes for mingw32.
+
+ * win32/win32.c (mytimes): typo.
+
Tue Aug 15 01:45:28 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (argf_eof): should return true at the end of ARGF without
diff --git a/configure.in b/configure.in
index 6b3e8b5bc2..7b94b98d71 100644
--- a/configure.in
+++ b/configure.in
@@ -171,7 +171,8 @@ mingw*) LIBS="-lwsock32 -lmsvcrt $LIBS"
ac_cv_header_sys_param_h=no
ac_cv_header_sys_resource_h=no
ac_cv_header_sys_select_h=no
- ac_cv_header_sys_times_h=no;;
+ ac_cv_header_sys_times_h=no
+ ac_cv_func_times=yes;;
os2_emx*) LIBS="-lm $LIBS"
ac_cv_lib_dir_opendir=no;;
freebsd*) LIBS="-lm $LIBS"
diff --git a/win32/win32.c b/win32/win32.c
index e07d0086df..c024ca04cb 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -2488,14 +2488,14 @@ mytimes(struct tms *tmbuf)
if (GetProcessTimes(GetCurrentProcess(),&create, &exit, &kernel, &user)) {
tmbuf->tms_utime = filetime_to_clock(&user);
tmbuf->tms_stime = filetime_to_clock(&kernel);
- tmbuf->cutime = 0;
- tmbuf->cstime = 0;
+ tmbuf->tms_cutime = 0;
+ tmbuf->tms_cstime = 0;
}
else {
- tmbuf->utime = clock();
- tmbuf->stime = 0;
- tmbuf->cutime = 0;
- tmbuf->cstime = 0;
+ tmbuf->tms_utime = clock();
+ tmbuf->tms_stime = 0;
+ tmbuf->tms_cutime = 0;
+ tmbuf->tms_cstime = 0;
}
return 0;
}