2 files changed, 10 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index c00df6884..f10393f3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,8 @@
  - (djm) [includes.h monitor.c openbsd-compat/bindresvport.c]
    [openbsd-compat/rresvport.c] Some more headers: netinet/in.h 
    sys/socket.h and unistd.h in various places
+ - (dtucker) [openbsd-compat/bsd-cygwin_util.c] Fix implict declaration
+   warnings for binary_open and binary_close.  Patch from Corinna Vinschen.
 
 20060831
  - (djm) [CREDITS LICENCE Makefile.in auth.c configure.ac includes.h ]
@@ -5368,4 +5370,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4522 2006/09/01 05:48:19 djm Exp $
+$Id: ChangeLog,v 1.4523 2006/09/01 09:29:01 dtucker Exp $
diff --git a/openbsd-compat/bsd-cygwin_util.c b/openbsd-compat/bsd-cygwin_util.c
index 4d31ef3b5..dbf8176b6 100644
--- a/openbsd-compat/bsd-cygwin_util.c
+++ b/openbsd-compat/bsd-cygwin_util.c
@@ -31,6 +31,13 @@
 
 #ifdef HAVE_CYGWIN
 
+#if defined(open) && open == binary_open
+# undef open
+#endif
+#if defined(pipe) && open == binary_pipe
+# undef pipe
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/utsname.h>
@@ -48,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, ...)
 {