X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/01d35895bd00d71a21c3429c7012197150d621a4..07e61b8a4b7462d21b9cb63d6a0ac0cd5169af8f:/openbsd-compat/bsd-cygwin_util.c diff --git a/openbsd-compat/bsd-cygwin_util.c b/openbsd-compat/bsd-cygwin_util.c index b408dde2..dbf8176b 100644 --- a/openbsd-compat/bsd-cygwin_util.c +++ b/openbsd-compat/bsd-cygwin_util.c @@ -31,11 +31,23 @@ #ifdef HAVE_CYGWIN -#include -#include +#if defined(open) && open == binary_open +# undef open +#endif +#if defined(pipe) && open == binary_pipe +# undef pipe +#endif + +#include +#include #include #include + +#include +#include +#include #include + #include "xmalloc.h" #define is_winnt (GetVersion() < 0x80000000) @@ -43,13 +55,6 @@ #define ntsec_off(c) ((c) && strstr((c),"nontsec")) #define ntea_on(c) ((c) && strstr((c),"ntea") && !strstr((c),"nontea")) -#if defined(open) && open == binary_open -# undef open -#endif -#if defined(pipe) && open == binary_pipe -# undef pipe -#endif - int binary_open(const char *filename, int flags, ...) {