diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | openbsd-compat/bsd-cygwin_util.h | 7 | ||||
-rw-r--r-- | session.c | 6 |
3 files changed, 9 insertions, 8 deletions
@@ -8,6 +8,8 @@ | |||
8 | from OpenBSD. | 8 | from OpenBSD. |
9 | - (dtucker) [openbsd-compat/bsd-cygwin_util.c openbsd-compat/bsd-cygwin_util.h] | 9 | - (dtucker) [openbsd-compat/bsd-cygwin_util.c openbsd-compat/bsd-cygwin_util.h] |
10 | Remove incorrect filenames from comments (file names are in Id tags). | 10 | Remove incorrect filenames from comments (file names are in Id tags). |
11 | - (dtucker) [session.c openbsd-compat/bsd-cygwin_util.h] Move Cygwin | ||
12 | specific defines and includes to bsd-cygwin_util.h. Fixes build error too. | ||
11 | 13 | ||
12 | 20030802 | 14 | 20030802 |
13 | - (dtucker) [monitor.h monitor_wrap.h] Remove excess ident tags. | 15 | - (dtucker) [monitor.h monitor_wrap.h] Remove excess ident tags. |
@@ -796,4 +798,4 @@ | |||
796 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 798 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
797 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 799 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
798 | 800 | ||
799 | $Id: ChangeLog,v 1.2883 2003/08/07 06:23:43 dtucker Exp $ | 801 | $Id: ChangeLog,v 1.2884 2003/08/07 06:28:16 dtucker Exp $ |
diff --git a/openbsd-compat/bsd-cygwin_util.h b/openbsd-compat/bsd-cygwin_util.h index f9149fd17..5ccb0fba2 100644 --- a/openbsd-compat/bsd-cygwin_util.h +++ b/openbsd-compat/bsd-cygwin_util.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: bsd-cygwin_util.h,v 1.9 2003/08/07 06:23:43 dtucker Exp $ */ | 1 | /* $Id: bsd-cygwin_util.h,v 1.10 2003/08/07 06:28:16 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000, 2001, Corinna Vinschen <vinschen@cygnus.com> | 4 | * Copyright (c) 2000, 2001, Corinna Vinschen <vinschen@cygnus.com> |
@@ -34,6 +34,11 @@ | |||
34 | 34 | ||
35 | #ifdef HAVE_CYGWIN | 35 | #ifdef HAVE_CYGWIN |
36 | 36 | ||
37 | #undef ERROR | ||
38 | #define is_winnt (GetVersion() < 0x80000000) | ||
39 | |||
40 | #include <windows.h> | ||
41 | #include <sys/cygwin.h> | ||
37 | #include <io.h> | 42 | #include <io.h> |
38 | 43 | ||
39 | int binary_open(const char *, int , ...); | 44 | int binary_open(const char *, int , ...); |
@@ -58,12 +58,6 @@ RCSID("$OpenBSD: session.c,v 1.159 2003/07/22 13:35:22 markus Exp $"); | |||
58 | #include "session.h" | 58 | #include "session.h" |
59 | #include "monitor_wrap.h" | 59 | #include "monitor_wrap.h" |
60 | 60 | ||
61 | #ifdef HAVE_CYGWIN | ||
62 | #include <windows.h> | ||
63 | #include <sys/cygwin.h> | ||
64 | #define is_winnt (GetVersion() < 0x80000000) | ||
65 | #endif | ||
66 | |||
67 | /* func */ | 61 | /* func */ |
68 | 62 | ||
69 | Session *session_new(void); | 63 | Session *session_new(void); |