From 610cb6387ed929a0c489079017a032388ae05d1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien.villemot@ens.fr>
Date: Fri, 14 Jan 2011 16:22:58 +0100
Subject: [PATCH] Dynare++: fixed warning about redefined NOMINMAX macro

---
 dynare++/kord/journal.cweb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dynare++/kord/journal.cweb b/dynare++/kord/journal.cweb
index 631aa5f72..456d1e41d 100644
--- a/dynare++/kord/journal.cweb
+++ b/dynare++/kord/journal.cweb
@@ -1,5 +1,4 @@
-@q $Id: journal.cweb 413 2005-08-16 14:39:55Z kamenik $ @>
-@q Copyright 2004, Ondra Kamenik @>
+@q Copyright (C) 2004-2011, Ondra Kamenik @>
 
 @ Start of {\tt journal.cpp} file.
 
@@ -254,7 +253,9 @@ Number of online processors is not implemented and returns -1, since
 Windows kernel32 |GetSystemInfo| call is too complicated.
 
 @<|sysconf| Win32 implementation@>=
-#define NOMINMAX // Do not define "min" and "max" macros
+#ifndef NOMINMAX
+# define NOMINMAX // Do not define "min" and "max" macros
+#endif
 #include <windows.h>
 
 #define _SC_PAGESIZE 1