diff options
author | Colin Watson <cjwatson@debian.org> | 2013-05-16 14:04:24 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-05-16 14:04:24 +0100 |
commit | 031d51614426a5d5ad42f971831df373f5d6e6d8 (patch) | |
tree | 6a66dc70fd3444ea8064f25256bd2fccdce6e3cd /openbsd-compat/bsd-cygwin_util.h | |
parent | 43587d4ea4349c7b98edcde117f37e6ca2e1b674 (diff) | |
parent | 328b60656f29db6306994d7498dede386ec2d1c3 (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.2p2):
- Only warn for missing identity files that were explicitly specified
(closes: #708275).
- Fix bug in contributed contrib/ssh-copy-id script that could result in
"rm *" being called on mktemp failure (closes: #708419).
Diffstat (limited to 'openbsd-compat/bsd-cygwin_util.h')
-rw-r--r-- | openbsd-compat/bsd-cygwin_util.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/openbsd-compat/bsd-cygwin_util.h b/openbsd-compat/bsd-cygwin_util.h index b4bcd04b7..6061a6b01 100644 --- a/openbsd-compat/bsd-cygwin_util.h +++ b/openbsd-compat/bsd-cygwin_util.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* $Id: bsd-cygwin_util.h,v 1.15 2012/08/28 09:57:19 dtucker Exp $ */ | 1 | /* $Id: bsd-cygwin_util.h,v 1.15.4.1 2013/04/04 23:53:31 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000, 2001, 2011 Corinna Vinschen <vinschen@redhat.com> | 4 | * Copyright (c) 2000, 2001, 2011, 2013 Corinna Vinschen <vinschen@redhat.com> |
5 | * | 5 | * |
6 | * Redistribution and use in source and binary forms, with or without | 6 | * Redistribution and use in source and binary forms, with or without |
7 | * modification, are permitted provided that the following conditions | 7 | * modification, are permitted provided that the following conditions |
@@ -36,24 +36,21 @@ | |||
36 | 36 | ||
37 | #undef ERROR | 37 | #undef ERROR |
38 | 38 | ||
39 | #define WIN32_LEAN_AND_MEAN | 39 | /* Avoid including windows headers. */ |
40 | typedef void *HANDLE; | ||
41 | #define INVALID_HANDLE_VALUE ((HANDLE) -1) | ||
40 | 42 | ||
41 | #include <windows.h> | ||
42 | #include <sys/cygwin.h> | 43 | #include <sys/cygwin.h> |
43 | #include <io.h> | 44 | #include <io.h> |
44 | 45 | ||
45 | /* Make sure _WIN32 isn't defined later in the code, otherwise headers from | ||
46 | other packages might get the wrong idea about the target system. */ | ||
47 | #ifdef _WIN32 | ||
48 | #undef _WIN32 | ||
49 | #endif | ||
50 | |||
51 | int binary_open(const char *, int , ...); | 46 | int binary_open(const char *, int , ...); |
52 | int check_ntsec(const char *); | 47 | int check_ntsec(const char *); |
53 | char **fetch_windows_environment(void); | 48 | char **fetch_windows_environment(void); |
54 | void free_windows_environment(char **); | 49 | void free_windows_environment(char **); |
55 | 50 | ||
51 | #ifndef NO_BINARY_OPEN | ||
56 | #define open binary_open | 52 | #define open binary_open |
53 | #endif | ||
57 | 54 | ||
58 | #endif /* HAVE_CYGWIN */ | 55 | #endif /* HAVE_CYGWIN */ |
59 | 56 | ||