diff options
author | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
commit | f38224d546cdde55f45c13d3d8225d273a3f920e (patch) | |
tree | a91a26b88ac90dc72d0ea3767feabb341eaa50a8 /openbsd-compat/bsd-cygwin_util.h | |
parent | 338146a3fc257e216fe5c10fe40e6896b40d7739 (diff) | |
parent | e90790abaf031e037f444a6658e136e48577ea49 (diff) |
merge 5.9p1
Diffstat (limited to 'openbsd-compat/bsd-cygwin_util.h')
-rw-r--r-- | openbsd-compat/bsd-cygwin_util.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/openbsd-compat/bsd-cygwin_util.h b/openbsd-compat/bsd-cygwin_util.h index 39b8eb788..48f64b740 100644 --- a/openbsd-compat/bsd-cygwin_util.h +++ b/openbsd-compat/bsd-cygwin_util.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* $Id: bsd-cygwin_util.h,v 1.12 2009/03/08 00:40:28 dtucker Exp $ */ | 1 | /* $Id: bsd-cygwin_util.h,v 1.13 2011/08/17 01:31:09 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000, 2001, Corinna Vinschen <vinschen@cygnus.com> | 4 | * Copyright (c) 2000, 2001, 2011 Corinna Vinschen <vinschen@redhat.com> |
5 | * | 5 | * |
6 | * Redistribution and use in source and binary forms, with or without | 6 | * Redistribution and use in source and binary forms, with or without |
7 | * modification, are permitted provided that the following conditions | 7 | * modification, are permitted provided that the following conditions |
@@ -41,13 +41,11 @@ | |||
41 | #include <io.h> | 41 | #include <io.h> |
42 | 42 | ||
43 | int binary_open(const char *, int , ...); | 43 | int binary_open(const char *, int , ...); |
44 | int binary_pipe(int fd[2]); | ||
45 | int check_ntsec(const char *); | 44 | int check_ntsec(const char *); |
46 | char **fetch_windows_environment(void); | 45 | char **fetch_windows_environment(void); |
47 | void free_windows_environment(char **); | 46 | void free_windows_environment(char **); |
48 | 47 | ||
49 | #define open binary_open | 48 | #define open binary_open |
50 | #define pipe binary_pipe | ||
51 | 49 | ||
52 | #endif /* HAVE_CYGWIN */ | 50 | #endif /* HAVE_CYGWIN */ |
53 | 51 | ||