diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-08-15 07:11:13 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-08-15 07:11:13 +0000 |
| commit | cf46a5142084f7381836cf99533d5245a334be43 (patch) | |
| tree | f584d6d8a8a8601be55448657a50bef7e6d1c2f0 | |
| parent | 987e8a8c791872145007e4ebb11644303b4dc833 (diff) | |
| download | ruby-cf46a5142084f7381836cf99533d5245a334be43.tar.gz ruby-cf46a5142084f7381836cf99533d5245a334be43.tar.xz ruby-cf46a5142084f7381836cf99533d5245a334be43.zip | |
eban
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@892 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | win32/win32.c | 12 |
3 files changed, 14 insertions, 7 deletions
@@ -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 6b3e8b5bc..7b94b98d7 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 e07d0086d..c024ca04c 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; } |