Commit c9627cdb authored by Darren Tucker's avatar Darren Tucker

- (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.
parent 75db01d2
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
- (tim) [Makefile.in] remove some duplication introduced in 20130220 commit.
......
/*
* 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"
......
/* $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
* modification, are permitted provided that the following conditions
......@@ -36,24 +36,21 @@
#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 <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 check_ntsec(const char *);
char **fetch_windows_environment(void);
void free_windows_environment(char **);
#ifndef NO_BINARY_OPEN
#define open binary_open
#endif
#endif /* HAVE_CYGWIN */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment