summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygserver/ChangeLog4
-rw-r--r--winsup/cygserver/woutsup.h17
2 files changed, 5 insertions, 16 deletions
diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog
index 6740069ca..c3731f710 100644
--- a/winsup/cygserver/ChangeLog
+++ b/winsup/cygserver/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-19 Corinna Vinschen <corinna@vinschen.de>
+
+ * woutsup.h: Just include winlean.h.
+
2012-03-19 Christopher Faylor <me.cygwin2012@cgf.cx>
* client.cc: Revert sigproc.h inclusion since it was fixed elsewhere.
diff --git a/winsup/cygserver/woutsup.h b/winsup/cygserver/woutsup.h
index b262ae2a1..5598c11c2 100644
--- a/winsup/cygserver/woutsup.h
+++ b/winsup/cygserver/woutsup.h
@@ -23,22 +23,7 @@ details. */
#define _WIN32_WINNT 0x0500
#endif
-#define WIN32_LEAN_AND_MEAN 1
-#define _WINGDI_H
-#define _WINUSER_H
-#define _WINNLS_H
-#define _WINVER_H
-#define _WINNETWK_H
-#define _WINSVC_H
-#include <windows.h>
-#include <wincrypt.h>
-#include <lmcons.h>
-#undef _WINGDI_H
-#undef _WINUSER_H
-#undef _WINNLS_H
-#undef _WINVER_H
-#undef _WINNETWK_H
-#undef _WINSVC_H
+#include "winlean.h"
#include "bsd_helper.h"
#include "bsd_log.h"