From c23a63478ae146c6b93e3a7c7e140e9f7387f6af Mon Sep 17 00:00:00 2001
From: Enrico Forestieri <forenr@lyx.org>
Date: Wed, 18 Mar 2009 11:52:26 +0000
Subject: [PATCH] Fixes for gcc4 on cygwin.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28848 a592a061-630c-0410-9148-cb99ea01b6c8
---
 configure.ac              | 1 +
 src/client/client.cpp     | 3 +++
 src/support/os_cygwin.cpp | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index eb8c689cf7..2468ad9456 100644
--- a/configure.ac
+++ b/configure.ac
@@ -352,6 +352,7 @@ char * strerror(int n);
 #define BOOST_NO_WSTRING 1
 
 #ifdef __CYGWIN__
+#  define NOMINMAX
 #  define BOOST_POSIX 1
 #  define BOOST_POSIX_API 1
 #  define BOOST_POSIX_PATH 1
diff --git a/src/client/client.cpp b/src/client/client.cpp
index c1b10a8b17..c6bb24744d 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -47,6 +47,9 @@
 // fcntl()
 #include <fcntl.h>
 
+// strerror()
+#include <string.h>
+
 #include <cerrno>
 #include <cstdio>
 #include <cstdlib>
diff --git a/src/support/os_cygwin.cpp b/src/support/os_cygwin.cpp
index 6b91873e3c..762fdb0c2e 100644
--- a/src/support/os_cygwin.cpp
+++ b/src/support/os_cygwin.cpp
@@ -25,6 +25,7 @@
 #include <windef.h>
 #include <shellapi.h>
 #include <shlwapi.h>
+#include <limits.h>
 
 #include <sys/cygwin.h>
 
@@ -122,7 +123,7 @@ string convert_path_list(string const & p, PathStyle const & target)
 
 } // namespace anon
 
-void os::init(int, char *[])
+void init(int, char *[])
 {
 	// Make sure that the TEMP variable is set
 	// and sync the Windows environment.