summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-08-05 19:08:16 +1000
committerDarren Tucker <dtucker@zip.com.au>2006-08-05 19:08:16 +1000
commit92350103fcf406d054a698ab2ea34feb4bfff6fc (patch)
treee3faa6eea711fc59b4c237709c5fb7f9dbe8c446
parentf676c57958c8e9a743f54a95479db478248d6fd0 (diff)
- (dtucker) [openbsd-compat/bsd-cygwin_util.c] Add headers required to compile
on Cygwin.
-rw-r--r--ChangeLog4
-rw-r--r--openbsd-compat/bsd-cygwin_util.c9
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 37e6532af..ce2ee60d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -118,6 +118,8 @@
118 - dtucker@cvs.openbsd.org 2006/08/05 08:34:04 118 - dtucker@cvs.openbsd.org 2006/08/05 08:34:04
119 [packet.c] 119 [packet.c]
120 Typo in comment 120 Typo in comment
121 - (dtucker) [openbsd-compat/bsd-cygwin_util.c] Add headers required to compile
122 on Cygwin.
121 123
12220060804 12420060804
123 - (dtucker) [configure.ac] The "crippled AES" test does not work on recent 125 - (dtucker) [configure.ac] The "crippled AES" test does not work on recent
@@ -5188,4 +5190,4 @@
5188 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5190 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5189 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5191 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5190 5192
5191$Id: ChangeLog,v 1.4469 2006/08/05 08:51:08 dtucker Exp $ 5193$Id: ChangeLog,v 1.4470 2006/08/05 09:08:16 dtucker Exp $
diff --git a/openbsd-compat/bsd-cygwin_util.c b/openbsd-compat/bsd-cygwin_util.c
index b408dde2d..4d31ef3b5 100644
--- a/openbsd-compat/bsd-cygwin_util.c
+++ b/openbsd-compat/bsd-cygwin_util.c
@@ -31,11 +31,16 @@
31 31
32#ifdef HAVE_CYGWIN 32#ifdef HAVE_CYGWIN
33 33
34#include <fcntl.h> 34#include <sys/types.h>
35#include <stdlib.h> 35#include <sys/stat.h>
36#include <sys/utsname.h> 36#include <sys/utsname.h>
37#include <sys/vfs.h> 37#include <sys/vfs.h>
38
39#include <fcntl.h>
40#include <stdlib.h>
41#include <unistd.h>
38#include <windows.h> 42#include <windows.h>
43
39#include "xmalloc.h" 44#include "xmalloc.h"
40#define is_winnt (GetVersion() < 0x80000000) 45#define is_winnt (GetVersion() < 0x80000000)
41 46