summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/winlean.h
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2012-06-27 13:19:11 +0000
committerCorinna Vinschen <corinna@vinschen.de>2012-06-27 13:19:11 +0000
commit25f3ea84f8170ef2f5cb4aba11f547723f360760 (patch)
treec38d060e69aa687e39cb5499e79354af7b91393c /winsup/cygwin/winlean.h
parenta90b8a20ed988808488962636b9c6c8665cb9413 (diff)
downloadcygnal-25f3ea84f8170ef2f5cb4aba11f547723f360760.tar.gz
cygnal-25f3ea84f8170ef2f5cb4aba11f547723f360760.tar.bz2
cygnal-25f3ea84f8170ef2f5cb4aba11f547723f360760.zip
* advapi32.cc (_ADVAPI32_): Define. Explain why.
(ImpersonateNamedPipeClient): Add missing WINAPI. * ntdll.h (STATUS_INVALID_PARAMETER): Only define if it isn't already. (STATUS_DLL_NOT_FOUND): Ditto. (STATUS_ENTRYPOINT_NOT_FOUND): Ditto. (enum _EVENT_TYPE): Guard against redefinition since it's already defined in Mingw64's ntdef.h. (enum _TIMER_TYPE): Ditto. (enum _SECTION_INHERIT): Define if using Mingw64 headers since it's missing in Mingw64's ntdef.h. * winlean.h (__STRALIGN_H_): Define before including windows.h.
Diffstat (limited to 'winsup/cygwin/winlean.h')
-rw-r--r--winsup/cygwin/winlean.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/winsup/cygwin/winlean.h b/winsup/cygwin/winlean.h
index d2d7f7a56..e5eeeb2ac 100644
--- a/winsup/cygwin/winlean.h
+++ b/winsup/cygwin/winlean.h
@@ -1,6 +1,6 @@
/* winlean.h - Standard "lean" windows include
- Copyright 2010, 2011 Red Hat, Inc.
+ Copyright 2010, 2011, 2012 Red Hat, Inc.
This file is part of Cygwin.
@@ -17,6 +17,7 @@ details. */
#define _WINVER_H
#define _WINNETWK_H
#define _WINSVC_H
+#define __STRALIGN_H_
#include <windows.h>
#include <wincrypt.h>
#include <lmcons.h>
@@ -27,6 +28,7 @@ details. */
#undef _WINVER_H
#undef _WINNETWK_H
#undef _WINSVC_H
+#undef __STRALIGN_H_
/* When Terminal Services are installed, the GetWindowsDirectory function
does not return the system installation dir, but a user specific directory
instead. That's not what we have in mind when calling GetWindowsDirectory