diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2013-04-01 12:40:48 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2013-04-01 12:40:48 +1100 |
| commit | c9627cdbc65b25da943f24e6a953da899f08eefc (patch) | |
| tree | 41cb784f399298c12386535e29549e1b8e8b6551 /openbsd-compat/bsd-cygwin_util.c | |
| parent | 75db01d2ce29a85f8e5a2aff2011446896cf3f8a (diff) | |
- (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" |