RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-01-09 19:19:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

- (djm) Fix my breaking of cygwin builds, Patch from Corinna Vinschen

Browse Source 
<vinschen@redhat.com> and myself.
This commit is contained in:
Damien Miller 2001-02-18 12:30:55 +11:00
parent e74ebd03c2
commit 2deb3f64f6
4 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -3,6 +3,8 @@
<tim@multitalents.net> <tim@multitalents.net>
- (Bal) Patch for lack of RA_RESTART in misc.c for mysignal by - (Bal) Patch for lack of RA_RESTART in misc.c for mysignal by
stevesk stevesk
- (djm) Fix my breaking of cygwin builds, Patch from Corinna Vinschen
<vinschen@redhat.com> and myself.
20010217 20010217
- (bal) OpenBSD Sync: - (bal) OpenBSD Sync:
@ -4010,4 +4012,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.784 2001/02/17 16:51:07 mouring Exp $ $Id: ChangeLog,v 1.785 2001/02/18 01:30:55 djm Exp $

4
Makefile.in
View File

@ -1,4 +1,4 @@
# $Id: Makefile.in,v 1.152 2001/02/15 03:01:59 mouring Exp $ # $Id: Makefile.in,v 1.153 2001/02/18 01:30:55 djm Exp $
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
@ -26,7 +26,7 @@ PATHS= -DETCDIR=\"$(sysconfdir)\" \
CC=@CC@ CC=@CC@
LD=@LD@ LD=@LD@
CFLAGS=@CFLAGS@ CFLAGS=@CFLAGS@
CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir)/openbsd-compat -I$(srcdir) $(PATHS) @DEFS@ CPPFLAGS=@CPPFLAGS@ -I$(srcdir)/openbsd-compat $(PATHS) @DEFS@
LIBS=@LIBS@ LIBS=@LIBS@
AR=@AR@ AR=@AR@
RANLIB=@RANLIB@ RANLIB=@RANLIB@

17
openbsd-compat/bsd-cygwin_util.c
View File

@ -15,7 +15,7 @@
#include "includes.h" #include "includes.h"
RCSID("$Id: bsd-cygwin_util.c,v 1.2 2001/02/09 01:55:36 djm Exp $"); RCSID("$Id: bsd-cygwin_util.c,v 1.3 2001/02/18 01:30:56 djm Exp $");
#ifdef HAVE_CYGWIN #ifdef HAVE_CYGWIN
@ -26,8 +26,21 @@ RCSID("$Id: bsd-cygwin_util.c,v 1.2 2001/02/09 01:55:36 djm Exp $");
#include <windows.h> #include <windows.h>
#define is_winnt (GetVersion() < 0x80000000) #define is_winnt (GetVersion() < 0x80000000)
int binary_open(const char *filename, int flags, mode_t mode) #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, ...)
{ {
va_list ap;
mode_t mode;
va_start(ap, flags);
mode = va_arg(ap, mode_t);
va_end(ap);
return open(filename, flags | O_BINARY, mode); return open(filename, flags | O_BINARY, mode);
} }

7
openbsd-compat/bsd-cygwin_util.h
View File

@ -13,9 +13,10 @@
* binary mode on Windows systems. * binary mode on Windows systems.
*/ */
/* $Id: bsd-cygwin_util.h,v 1.2 2001/02/09 01:55:36 djm Exp $ */ /* $Id: bsd-cygwin_util.h,v 1.3 2001/02/18 01:30:56 djm Exp $ */
#include "config.h" #ifndef _BSD_CYGWIN_UTIL_H
#define _BSD_CYGWIN_UTIL_H
#ifdef HAVE_CYGWIN #ifdef HAVE_CYGWIN
@ -28,3 +29,5 @@ int check_ntsec(const char *filename);
#define pipe binary_pipe #define pipe binary_pipe
#endif /* HAVE_CYGWIN */ #endif /* HAVE_CYGWIN */
#endif /* _BSD_CYGWIN_UTIL_H */