Mercurial > octave-nkf
changeset 6237:4a8c7f586ec4
[project @ 2007-01-10 19:20:09 by jwe]
| author | jwe |
|---|---|
| date | Wed, 10 Jan 2007 19:20:10 +0000 |
| parents | 1bed9b2c26e0 |
| children | 3ecd8d2c5654 |
| files | src/ChangeLog src/DLD-FUNCTIONS/getrusage.cc |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Jan 10 18:20:18 2007 +0000 +++ b/src/ChangeLog Wed Jan 10 19:20:10 2007 +0000 @@ -1,3 +1,7 @@ +2007-01-10 Michael Goffioul <michael.goffioul@swing.be> + + * DLD-FUNCTIONS/getrusage.cc: Use #ifdef __WIN32__, not __MINGW32__. + 2007-01-10 John W. Eaton <jwe@octave.org> * parse.y (load_fcn_from_file): Only compare last two characters
--- a/src/DLD-FUNCTIONS/getrusage.cc Wed Jan 10 18:20:18 2007 +0000 +++ b/src/DLD-FUNCTIONS/getrusage.cc Wed Jan 10 19:20:10 2007 +0000 @@ -35,7 +35,7 @@ #include <sys/resource.h> #endif -#if defined (__MINGW32__) +#if defined (__WIN32__) #include <windows.h> #endif @@ -196,7 +196,7 @@ tv_tmp.assign ("usec", static_cast<double> (fraction * 1e6 / HZ)); m.assign ("stime", octave_value (tv_tmp)); -#elif defined (__MINGW32__) +#elif defined (__WIN32__) HANDLE hProcess = GetCurrentProcess (); FILETIME ftCreation, ftExit, ftUser, ftKernel; GetProcessTimes (hProcess, &ftCreation, &ftExit, &ftKernel, &ftUser);