tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (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.
This commit is contained in:
Darren Tucker 2013-04-01 12:40:48 +11:00
parent 75db01d2ce
commit c9627cdbc6
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
20130401
- (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.
20120323 20120323
- (tim) [Makefile.in] remove some duplication introduced in 20130220 commit. - (tim) [Makefile.in] remove some duplication introduced in 20130220 commit.

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

@ -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 * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -27,20 +27,15 @@
* binary mode on Windows systems. * binary mode on Windows systems.
*/ */
#define NO_BINARY_OPEN /* Avoid redefining open to binary_open for this file */
#include "includes.h" #include "includes.h"
#ifdef HAVE_CYGWIN #ifdef HAVE_CYGWIN
#if defined(open) && open == binary_open
# undef open
#endif
#include <sys/types.h> #include <sys/types.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdlib.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <windows.h>
#include "xmalloc.h" #include "xmalloc.h"

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

@ -1,7 +1,7 @@
/* $Id: bsd-cygwin_util.h,v 1.15 2012/08/28 09:57:19 dtucker Exp $ */ /* $Id: bsd-cygwin_util.h,v 1.16 2013/04/01 01:40:49 dtucker Exp $ */
/* /*
* 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 * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -36,24 +36,21 @@
#undef ERROR #undef ERROR
#define WIN32_LEAN_AND_MEAN /* Avoid including windows headers. */
typedef void *HANDLE;
#define INVALID_HANDLE_VALUE ((HANDLE) -1)
#include <windows.h>
#include <sys/cygwin.h> #include <sys/cygwin.h>
#include <io.h> #include <io.h>
/* Make sure _WIN32 isn't defined later in the code, otherwise headers from
other packages might get the wrong idea about the target system. */
#ifdef _WIN32
#undef _WIN32
#endif
int binary_open(const char *, int , ...); int binary_open(const char *, int , ...);
int check_ntsec(const char *); int check_ntsec(const char *);
char **fetch_windows_environment(void); char **fetch_windows_environment(void);
void free_windows_environment(char **); void free_windows_environment(char **);
#ifndef NO_BINARY_OPEN
#define open binary_open #define open binary_open
#endif
#endif /* HAVE_CYGWIN */ #endif /* HAVE_CYGWIN */