summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--openbsd-compat/bsd-cygwin_util.h8
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 00be8d367..2bd907cc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
4 - (djm) [entropy.c] bz#1991: relax OpenSSL version test to allow running 4 - (djm) [entropy.c] bz#1991: relax OpenSSL version test to allow running
5 openssh binaries on a newer fix release than they were compiled on. 5 openssh binaries on a newer fix release than they were compiled on.
6 with and ok dtucker@ 6 with and ok dtucker@
7 - (djm) [openbsd-compat/bsd-cygwin_util.h] #undef _WIN32 to avoid incorrect
8 assumptions when building on Cygwin; patch from Corinna Vinschen
7 9
820120309 1020120309
9 - (djm) [openbsd-compat/port-linux.c] bz#1960: fix crash on SELinux 11 - (djm) [openbsd-compat/port-linux.c] bz#1960: fix crash on SELinux
diff --git a/openbsd-compat/bsd-cygwin_util.h b/openbsd-compat/bsd-cygwin_util.h
index 48f64b740..d223792d7 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.13 2011/08/17 01:31:09 djm Exp $ */ 1/* $Id: bsd-cygwin_util.h,v 1.14 2012/03/30 03:07:07 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000, 2001, 2011 Corinna Vinschen <vinschen@redhat.com> 4 * Copyright (c) 2000, 2001, 2011 Corinna Vinschen <vinschen@redhat.com>
@@ -40,6 +40,12 @@
40#include <sys/cygwin.h> 40#include <sys/cygwin.h>
41#include <io.h> 41#include <io.h>
42 42
43/* Make sure _WIN32 isn't defined later in the code, otherwise headers from
44 other packages might get the wrong idea about the target system. */
45#ifdef _WIN32
46#undef _WIN32
47#endif
48
43int binary_open(const char *, int , ...); 49int binary_open(const char *, int , ...);
44int check_ntsec(const char *); 50int check_ntsec(const char *);
45char **fetch_windows_environment(void); 51char **fetch_windows_environment(void);