diff options
| author | dtucker <dtucker> | 2013-04-01 01:40:48 +0000 |
|---|---|---|
| committer | dtucker <dtucker> | 2013-04-01 01:40:48 +0000 |
| commit | 08807542c0f4cbd83dec96370fc60ee6b390636b (patch) | |
| tree | 781e626de7dd94827271987bf5493881b4d4df9b /openbsd-compat/bsd-cygwin_util.c | |
| parent | a0061f13b8d357dd7afa737b61e10cfa0166b4c7 (diff) | |
| download | openssh-08807542c0f4cbd83dec96370fc60ee6b390636b.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.
Diffstat (limited to 'openbsd-compat/bsd-cygwin_util.c')
| -rw-r--r-- | openbsd-compat/bsd-cygwin_util.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/openbsd-compat/bsd-cygwin_util.c b/openbsd-compat/bsd-cygwin_util.c index 6befc016..d3d2d913 100644 --- a/openbsd-compat/bsd-cygwin_util.c +++ b/openbsd-compat/bsd-cygwin_util.c @@ -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 * modification, are permitted provided that the following conditions @@ -27,20 +27,15 @@ * binary mode on Windows systems. */ +#define NO_BINARY_OPEN /* Avoid redefining open to binary_open for this file */ #include "includes.h" #ifdef HAVE_CYGWIN -#if defined(open) && open == binary_open -# undef open -#endif - #include <sys/types.h> - #include <fcntl.h> -#include <stdlib.h> +#include <string.h> #include <unistd.h> -#include <windows.h> #include "xmalloc.h" |