summaryrefslogtreecommitdiffstats
path: root/openbsd-compat/bsd-cygwin_util.c
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2013-05-17 08:55:26 +0000
committerdes <des@FreeBSD.org>2013-05-17 08:55:26 +0000
commitce4282e0e95a9999373950b65afef4767f102c0a (patch)
treebbbe6a846456d8a2e82510f56d05ed52d1104e35 /openbsd-compat/bsd-cygwin_util.c
parent52a388c911b2db4695ad0443466408085840e047 (diff)
downloadFreeBSD-src-ce4282e0e95a9999373950b65afef4767f102c0a.zip
FreeBSD-src-ce4282e0e95a9999373950b65afef4767f102c0a.tar.gz
Vendor import of OpenSSH 6.2p2.
Diffstat (limited to 'openbsd-compat/bsd-cygwin_util.c')
-rw-r--r--openbsd-compat/bsd-cygwin_util.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/openbsd-compat/bsd-cygwin_util.c b/openbsd-compat/bsd-cygwin_util.c
index 6befc01..d3d2d91 100644
--- a/openbsd-compat/bsd-cygwin_util.c
+++ b/openbsd-compat/bsd-cygwin_util.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2001, 2011 Corinna Vinschen <vinschen@redhat.com>
+ * Copyright (c) 2000, 2001, 2011, 2013 Corinna Vinschen <vinschen@redhat.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -27,20 +27,15 @@
* binary mode on Windows systems.
*/
+#define NO_BINARY_OPEN /* Avoid redefining open to binary_open for this file */
#include "includes.h"
#ifdef HAVE_CYGWIN
-#if defined(open) && open == binary_open
-# undef open
-#endif
-
#include <sys/types.h>
-
#include <fcntl.h>
-#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
-#include <windows.h>
#include "xmalloc.h"
OpenPOWER on IntegriCloud