Mercurial > hg > octave-lyh

changeset 6113:2dc8e7f1ee1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-10-27 13:23:22 by jwe]
author jwe
date Fri, 27 Oct 2006 13:23:22 +0000
parents 05257ee9753d
children a0dafb51dd06
files liboctave/ChangeLog liboctave/oct-time.cc
diffstat 2 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-27  John W. Eaton  <jwe@octave.org>
+
+	* oct-time.cc: Undefine min and max after including windows.h.
+	From Michael Goffioul  <michael.goffioul@swing.be>.
+
 2006-10-26  John W. Eaton  <jwe@octave.org>
 
 	* lo-cutils.c (octave_strcasecmp, octave-strncasecmp):
--- a/liboctave/oct-time.cc
+++ b/liboctave/oct-time.cc
@@ -37,6 +37,8 @@
 
 #if defined (OCTAVE_USE_WINDOWS_API)
 #include <windows.h>
+#undef min
+#undef max
 #endif
 
 #include "lo-error.h"