diff options
author | Darren Tucker <dtucker@zip.com.au> | 2003-08-07 16:28:16 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2003-08-07 16:28:16 +1000 |
commit | 80649c5fa6af0f6c8122f567c2c01b6aabfef07c (patch) | |
tree | 4b2996fa237dac5edc045e65ed195a613c57bfd3 | |
parent | 854d7fd43968c5a20e906aa300c687f3434c7da8 (diff) |
- (dtucker) [session.c openbsd-compat/bsd-cygwin_util.h] Move Cygwin
specific defines and includes to bsd-cygwin_util.h. Fixes build error too.
-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 @@ 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. @@ -796,4 +798,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.2883 2003/08/07 06:23:43 dtucker Exp $ +$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 f9149fd1..5ccb0fba 100644 --- a/openbsd-compat/bsd-cygwin_util.h +++ b/openbsd-compat/bsd-cygwin_util.h @@ -1,4 +1,4 @@ -/* $Id: bsd-cygwin_util.h,v 1.9 2003/08/07 06:23:43 dtucker Exp $ */ +/* $Id: bsd-cygwin_util.h,v 1.10 2003/08/07 06:28:16 dtucker Exp $ */ /* * Copyright (c) 2000, 2001, Corinna Vinschen <vinschen@cygnus.com> @@ -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 , ...); @@ -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); |