octave-maintainers
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

MSVC patch: getrusage.cc


From: John W. Eaton
Subject: MSVC patch: getrusage.cc
Date: Mon, 26 Feb 2007 15:57:31 -0500

On  7-Feb-2007, address@hidden wrote:

| The following patch is needed as windows.h defines \"min\" as a macro, which
| clashes with \"min\" member of time-related class (for minutes).
| 
| Michael.
| 
| Index: src/DLD-FUNCTIONS/getrusage.cc
| ===================================================================
| RCS file: /cvs/octave/src/DLD-FUNCTIONS/getrusage.cc,v
| retrieving revision 1.12
| diff -c -p -r1.12 getrusage.cc
| *** src/DLD-FUNCTIONS/getrusage.cc 10 Jan 2007 19:20:10 -0000 1.12
| --- src/DLD-FUNCTIONS/getrusage.cc 7 Feb 2007 10:59:46 -0000
| *************** Software Foundation, Inc., 51 Franklin S
| *** 37,42 ****
| --- 37,45 ----
|   
|   #if defined (__WIN32__)
|   #include <windows.h>
| + #ifdef min
| + #undef min
| + #endif
|   #endif

OK, I made this change.  I'd eventually like to limit the places where
we include <windows.h> to just a one or two files to avoid having this
kind of thing repeated many times.  But that change can wait.

jwe


reply via email to

[Prev in Thread] Current Thread [Next in Thread]