diff options
author | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
commit | d59fd3e421aa81b8e5e118f3f806081df2aca879 (patch) | |
tree | 356a4e607edc979c625bb33db63c656d771478bd /openbsd-compat/bsd-cygwin_util.h | |
parent | 7505658c58e96b8d270f1928a0e1fa7f3e0c266b (diff) | |
parent | 45431c9b4677608680cd071768cbf156b316a7e8 (diff) |
Merge 3.7.1p2 to the trunk. I have absolutely no idea yet whether this will
work.
Diffstat (limited to 'openbsd-compat/bsd-cygwin_util.h')
-rw-r--r-- | openbsd-compat/bsd-cygwin_util.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/openbsd-compat/bsd-cygwin_util.h b/openbsd-compat/bsd-cygwin_util.h index af470bdd8..5ccb0fba2 100644 --- a/openbsd-compat/bsd-cygwin_util.h +++ b/openbsd-compat/bsd-cygwin_util.h | |||
@@ -1,8 +1,6 @@ | |||
1 | /* $Id: bsd-cygwin_util.h,v 1.7 2002/04/15 22:00:52 stevesk Exp $ */ | 1 | /* $Id: bsd-cygwin_util.h,v 1.10 2003/08/07 06:28:16 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * cygwin_util.c | ||
5 | * | ||
6 | * Copyright (c) 2000, 2001, Corinna Vinschen <vinschen@cygnus.com> | 4 | * Copyright (c) 2000, 2001, Corinna Vinschen <vinschen@cygnus.com> |
7 | * | 5 | * |
8 | * Redistribution and use in source and binary forms, with or without | 6 | * Redistribution and use in source and binary forms, with or without |
@@ -36,12 +34,17 @@ | |||
36 | 34 | ||
37 | #ifdef HAVE_CYGWIN | 35 | #ifdef HAVE_CYGWIN |
38 | 36 | ||
37 | #undef ERROR | ||
38 | #define is_winnt (GetVersion() < 0x80000000) | ||
39 | |||
40 | #include <windows.h> | ||
41 | #include <sys/cygwin.h> | ||
39 | #include <io.h> | 42 | #include <io.h> |
40 | 43 | ||
41 | int binary_open(const char *filename, int flags, ...); | 44 | int binary_open(const char *, int , ...); |
42 | int binary_pipe(int fd[2]); | 45 | int binary_pipe(int fd[2]); |
43 | int check_nt_auth(int pwd_authenticated, struct passwd *pw); | 46 | int check_nt_auth(int, struct passwd *); |
44 | int check_ntsec(const char *filename); | 47 | int check_ntsec(const char *); |
45 | void register_9x_service(void); | 48 | void register_9x_service(void); |
46 | 49 | ||
47 | #define open binary_open | 50 | #define open binary_open |