summaryrefslogtreecommitdiff
path: root/openbsd-compat/bsd-cygwin_util.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2013-05-16 13:50:50 +0100
committerColin Watson <cjwatson@debian.org>2013-05-16 13:50:50 +0100
commit328b60656f29db6306994d7498dede386ec2d1c3 (patch)
tree7d3a4fd1eb06c355e7122b89b408b51b0b9b6c9b /openbsd-compat/bsd-cygwin_util.c
parent91c1846f2f94bc944f5e8f53b9903cb59ca42adc (diff)
parent79524838f0d5eb1cdf9fc268ec4c0bce46ccb67f (diff)
merge 6.2p2
Diffstat (limited to 'openbsd-compat/bsd-cygwin_util.c')
-rw-r--r--openbsd-compat/bsd-cygwin_util.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/openbsd-compat/bsd-cygwin_util.c b/openbsd-compat/bsd-cygwin_util.c
index 6befc016f..d3d2d913a 100644
--- a/openbsd-compat/bsd-cygwin_util.c
+++ b/openbsd-compat/bsd-cygwin_util.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2000, 2001, 2011 Corinna Vinschen <vinschen@redhat.com> 2 * Copyright (c) 2000, 2001, 2011, 2013 Corinna Vinschen <vinschen@redhat.com>
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
@@ -27,20 +27,15 @@
27 * binary mode on Windows systems. 27 * binary mode on Windows systems.
28 */ 28 */
29 29
30#define NO_BINARY_OPEN /* Avoid redefining open to binary_open for this file */
30#include "includes.h" 31#include "includes.h"
31 32
32#ifdef HAVE_CYGWIN 33#ifdef HAVE_CYGWIN
33 34
34#if defined(open) && open == binary_open
35# undef open
36#endif
37
38#include <sys/types.h> 35#include <sys/types.h>
39
40#include <fcntl.h> 36#include <fcntl.h>
41#include <stdlib.h> 37#include <string.h>
42#include <unistd.h> 38#include <unistd.h>
43#include <windows.h>
44 39
45#include "xmalloc.h" 40#include "xmalloc.h"
46 41