diff options
| author | Damien Miller <djm@mindrot.org> | 2012-03-30 14:07:05 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2012-03-30 14:07:05 +1100 |
| commit | ce1ec9d4e27d4e08ef02e4e96818263d3ff2eecc (patch) | |
| tree | 2ac632b15195244fe93dea861311884787cfc0a6 | |
| parent | 4d55734c16aa104afea1e446788b3bc7a53999e6 (diff) | |
- (djm) [openbsd-compat/bsd-cygwin_util.h] #undef _WIN32 to avoid incorrect
assumptions when building on Cygwin; patch from Corinna Vinschen
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | openbsd-compat/bsd-cygwin_util.h | 8 |
2 files changed, 9 insertions, 1 deletions
@@ -4,6 +4,8 @@ - (djm) [entropy.c] bz#1991: relax OpenSSL version test to allow running openssh binaries on a newer fix release than they were compiled on. with and ok dtucker@ + - (djm) [openbsd-compat/bsd-cygwin_util.h] #undef _WIN32 to avoid incorrect + assumptions when building on Cygwin; patch from Corinna Vinschen 20120309 - (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 48f64b74..d223792d 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.13 2011/08/17 01:31:09 djm Exp $ */ +/* $Id: bsd-cygwin_util.h,v 1.14 2012/03/30 03:07:07 djm Exp $ */ /* * Copyright (c) 2000, 2001, 2011 Corinna Vinschen <vinschen@redhat.com> @@ -40,6 +40,12 @@ #include <sys/cygwin.h> #include <io.h> +/* Make sure _WIN32 isn't defined later in the code, otherwise headers from + other packages might get the wrong idea about the target system. */ +#ifdef _WIN32 +#undef _WIN32 +#endif + int binary_open(const char *, int , ...); int check_ntsec(const char *); char **fetch_windows_environment(void); |