diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2013-04-23 09:44:36 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2013-04-23 09:44:36 +0000 |
| commit | 61522196c71593da09572fce9af9e0d7dad61bc3 (patch) | |
| tree | 9bf74facd67974fa2f780d6ce68b14eb7a94e371 /winsup/cygwin/winlean.h | |
| parent | 1875ee55d31d3673059373c8f9837bf98f93c713 (diff) | |
| download | cygnal-61522196c71593da09572fce9af9e0d7dad61bc3.tar.gz cygnal-61522196c71593da09572fce9af9e0d7dad61bc3.tar.bz2 cygnal-61522196c71593da09572fce9af9e0d7dad61bc3.zip | |
* Merge in cygwin-64bit-branch.
Diffstat (limited to 'winsup/cygwin/winlean.h')
| -rw-r--r-- | winsup/cygwin/winlean.h | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/winsup/cygwin/winlean.h b/winsup/cygwin/winlean.h index 15e533037..8a4c2aeb2 100644 --- a/winsup/cygwin/winlean.h +++ b/winsup/cygwin/winlean.h @@ -12,13 +12,6 @@ details. */ #define _WINLEAN_H 1 #define WIN32_LEAN_AND_MEAN 1 -/* Mingw32 */ -#define _WINGDI_H -#define _WINUSER_H -#define _WINNLS_H -#define _WINVER_H -#define _WINNETWK_H -#define _WINSVC_H /* Mingw64 */ #define _WINNLS_ #define _WINNETWK_ @@ -34,8 +27,6 @@ details. */ #define _WINMM_ #define WINIMPM #define WINSOCK_API_LINKAGE -#define NTDDI_VERSION 0x6020000 /* Probably should just be derived from our - _WIN32_WINNT setting in winsup.h */ /* Windows headers define a couple of annoyingly intrusive macros for the sole purpose of inline documentation. Since they are defined without @@ -63,6 +54,11 @@ details. */ #include <lmcons.h> #include <ntdef.h> +/* Temporary kludge for missing flag in Mingw64's w32api. */ +#ifndef PIPE_REJECT_REMOTE_CLIENTS +#define PIPE_REJECT_REMOTE_CLIENTS 8 +#endif + #ifdef __undef_IN #undef IN #endif @@ -79,13 +75,6 @@ details. */ #undef CRITICAL #endif -#undef _WINGDI_H -#undef _WINUSER_H -#undef _WINNLS_H -#undef _WINVER_H -#undef _WINNETWK_H -#undef _WINSVC_H - #undef _WINNLS_ #undef _WINNETWK_ #undef _WINSVC_ |