summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-09-01 19:29:01 +1000
committerDarren Tucker <dtucker@zip.com.au>2006-09-01 19:29:01 +1000
commit0646ca6be81c4f0f619d92a4e5a041b58c79a221 (patch)
treed19d0a16bd4cf8dfc479c7b01f3b8a6d4472cea0
parent607aede26c4193bf1bc5063698ea9a36cbd990e3 (diff)
- (dtucker) [openbsd-compat/bsd-cygwin_util.c] Fix implict declaration
warnings for binary_open and binary_close. Patch from Corinna Vinschen.
-rw-r--r--ChangeLog4
-rw-r--r--openbsd-compat/bsd-cygwin_util.c14
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 @@
17 - (djm) [includes.h monitor.c openbsd-compat/bindresvport.c] 17 - (djm) [includes.h monitor.c openbsd-compat/bindresvport.c]
18 [openbsd-compat/rresvport.c] Some more headers: netinet/in.h 18 [openbsd-compat/rresvport.c] Some more headers: netinet/in.h
19 sys/socket.h and unistd.h in various places 19 sys/socket.h and unistd.h in various places
20 - (dtucker) [openbsd-compat/bsd-cygwin_util.c] Fix implict declaration
21 warnings for binary_open and binary_close. Patch from Corinna Vinschen.
20 22
2120060831 2320060831
22 - (djm) [CREDITS LICENCE Makefile.in auth.c configure.ac includes.h ] 24 - (djm) [CREDITS LICENCE Makefile.in auth.c configure.ac includes.h ]
@@ -5368,4 +5370,4 @@
5368 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5370 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5369 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5371 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5370 5372
5371$Id: ChangeLog,v 1.4522 2006/09/01 05:48:19 djm Exp $ 5373$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 @@
31 31
32#ifdef HAVE_CYGWIN 32#ifdef HAVE_CYGWIN
33 33
34#if defined(open) && open == binary_open
35# undef open
36#endif
37#if defined(pipe) && open == binary_pipe
38# undef pipe
39#endif
40
34#include <sys/types.h> 41#include <sys/types.h>
35#include <sys/stat.h> 42#include <sys/stat.h>
36#include <sys/utsname.h> 43#include <sys/utsname.h>
@@ -48,13 +55,6 @@
48#define ntsec_off(c) ((c) && strstr((c),"nontsec")) 55#define ntsec_off(c) ((c) && strstr((c),"nontsec"))
49#define ntea_on(c) ((c) && strstr((c),"ntea") && !strstr((c),"nontea")) 56#define ntea_on(c) ((c) && strstr((c),"ntea") && !strstr((c),"nontea"))
50 57
51#if defined(open) && open == binary_open
52# undef open
53#endif
54#if defined(pipe) && open == binary_pipe
55# undef pipe
56#endif
57
58int 58int
59binary_open(const char *filename, int flags, ...) 59binary_open(const char *filename, int flags, ...)
60{ 60{