# HG changeset patch
# User jld
# Date 1266398234 0
# Node ID 0979164a30d58a59722f66620a5673ea8507ea48
# Parent  d7774c2ebd5aad2618829ff394c2c7409368f4dd
* standalone/common/ecosconfig.cxx: Fix compilation on recent Cygwin hosts
  using NOMINMAX macro.

diff --git a/host/tools/configtool/ChangeLog b/host/tools/configtool/ChangeLog
--- a/host/tools/configtool/ChangeLog
+++ b/host/tools/configtool/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-17  John Dallaway  <john@dallaway.org.uk>
+
+	* standalone/common/ecosconfig.cxx: Fix compilation on recent
+	Cygwin hosts using NOMINMAX macro.
+
 2009-11-17  John Dallaway  <john@dallaway.org.uk>
 
 	* standalone/wxwin/packagesdlg.cpp: Fix the selection of a new
diff --git a/host/tools/configtool/standalone/common/ecosconfig.cxx b/host/tools/configtool/standalone/common/ecosconfig.cxx
--- a/host/tools/configtool/standalone/common/ecosconfig.cxx
+++ b/host/tools/configtool/standalone/common/ecosconfig.cxx
@@ -1,7 +1,7 @@
 // ####ECOSHOSTGPLCOPYRIGHTBEGIN####                                        
 // -------------------------------------------                              
 // This file is part of the eCos host tools.                                
-// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2010 Free Software Foundation, Inc.
 //
 // This program is free software; you can redistribute it and/or modify     
 // it under the terms of the GNU General Public License as published by     
@@ -41,6 +41,8 @@
 #include <unistd.h> /* for realpath() */
 #endif
 #ifdef __CYGWIN__
+// suppress min/max macro definitions in windef.h
+#define NOMINMAX
 #include <windows.h>
 #include <sys/cygwin.h> /* for cygwin_conv_to_win32_path() */
 #endif
@@ -48,7 +50,7 @@
 #include "ecosconfig.hxx"
 
 #define TOOL_VERSION "3.net"
-#define TOOL_COPYRIGHT "Copyright (c) 2002-2009 Free Software Foundation, Inc."
+#define TOOL_COPYRIGHT "Copyright (c) 2002-2010 Free Software Foundation, Inc."
 #define DEFAULT_SAVE_FILE "ecos.ecc"
 static const char* tool = "ecosconfig";