From: dtucker <dtucker>
Date: Thu, 7 Aug 2003 06:28:16 +0000 (+0000)
Subject:  - (dtucker) [session.c openbsd-compat/bsd-cygwin_util.h] Move Cygwin
X-Git-Tag: BEFORE_KRB5_GSSAPI_MERGE~23
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/a3b678a332263f4d552804fc459a10411672cdd2?ds=sidebyside

 - (dtucker) [session.c openbsd-compat/bsd-cygwin_util.h] Move Cygwin
   specific defines and includes to bsd-cygwin_util.h.  Fixes build error too.
---

diff --git a/ChangeLog b/ChangeLog
index 381a34a3..7622c6f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
    from OpenBSD.
  - (dtucker) [openbsd-compat/bsd-cygwin_util.c openbsd-compat/bsd-cygwin_util.h]
    Remove incorrect filenames from comments (file names are in Id tags).
+ - (dtucker) [session.c openbsd-compat/bsd-cygwin_util.h] Move Cygwin
+   specific defines and includes to bsd-cygwin_util.h.  Fixes build error too.
 
 20030802
  - (dtucker) [monitor.h monitor_wrap.h] Remove excess ident tags.
diff --git a/openbsd-compat/bsd-cygwin_util.h b/openbsd-compat/bsd-cygwin_util.h
index 5d460ee4..a0429ebc 100644
--- a/openbsd-compat/bsd-cygwin_util.h
+++ b/openbsd-compat/bsd-cygwin_util.h
@@ -34,6 +34,11 @@
 
 #ifdef HAVE_CYGWIN
 
+#undef ERROR
+#define is_winnt       (GetVersion() < 0x80000000)
+
+#include <windows.h>
+#include <sys/cygwin.h>
 #include <io.h>
 
 int binary_open(const char *, int , ...);
diff --git a/session.c b/session.c
index 83c2de0b..325b1753 100644
--- a/session.c
+++ b/session.c
@@ -58,12 +58,6 @@ RCSID("$OpenBSD: session.c,v 1.159 2003/07/22 13:35:22 markus Exp $");
 #include "session.h"
 #include "monitor_wrap.h"
 
-#ifdef HAVE_CYGWIN
-#include <windows.h>
-#include <sys/cygwin.h>
-#define is_winnt       (GetVersion() < 0x80000000)
-#endif
-
 /* func */
 
 Session *session_new(void);