diff options
author | dtucker <dtucker> | 2013-04-04 23:53:30 +0000 |
---|---|---|
committer | dtucker <dtucker> | 2013-04-04 23:53:30 +0000 |
commit | e2e435d19a5a748c257fe6f305c79b372fa42dca (patch) | |
tree | abcd17c08f78313b42fda7522c01aa159465c951 | |
parent | 08807542c0f4cbd83dec96370fc60ee6b390636b (diff) | |
download | openssh-e2e435d19a5a748c257fe6f305c79b372fa42dca.tar.gz |
- (dtucker) [openbsd-compat/bsd-cygwin_util.{c,h}] Don't include windows.h
to avoid conflicting definitions of __int64, adding the required bits.
Patch from Corinna Vinschen.
(pulled from HEAD but kept the ChangeLog date as it was)
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | openbsd-compat/bsd-cygwin_util.h | 2 |
2 files changed, 1 insertions, 7 deletions
@@ -3,16 +3,10 @@ to avoid conflicting definitions of __int64, adding the required bits. Patch from Corinna Vinschen. -20120323 - - (tim) [Makefile.in] remove some duplication introduced in 20130220 commit. - 20120322 - (djm) [contrib/ssh-copy-id contrib/ssh-copy-id.1] Updated to Phil Hands' greatly revised version. - (djm) Release 6.2p1 - - (dtucker) [configure.ac] Add stdlib.h to zlib check for exit() prototype. - - (dtucker) [includes.h] Check if _GNU_SOURCE is already defined before - defining it again. Prevents warnings if someone, eg, sets it in CFLAGS. 20120318 - (djm) [configure.ac log.c scp.c sshconnect2.c openbsd-compat/vis.c] diff --git a/openbsd-compat/bsd-cygwin_util.h b/openbsd-compat/bsd-cygwin_util.h index 372e4195..6061a6b0 100644 --- a/openbsd-compat/bsd-cygwin_util.h +++ b/openbsd-compat/bsd-cygwin_util.h @@ -1,4 +1,4 @@ -/* $Id: bsd-cygwin_util.h,v 1.16 2013/04/01 01:40:49 dtucker Exp $ */ +/* $Id: bsd-cygwin_util.h,v 1.15.4.1 2013/04/04 23:53:31 dtucker Exp $ */ /* * Copyright (c) 2000, 2001, 2011, 2013 Corinna Vinschen <vinschen@redhat.com> |