* advapi32.cc (_ADVAPI32_): Drop definition.

	* kernel32.cc (_KERNEL32_): Ditto.
	* winlean.h: Add definitions required to use Mingw64 headers.
	(FILE_SHARE_VALID_FLAGS): Drop definition.

3 files changed, 24 insertions, 13 deletions

diff --git a/winsup/cygwin/advapi32.cc b/winsup/cygwin/advapi32.cc
index 07a11a513..1b31c6597 100644
--- a/winsup/cygwin/advapi32.cc
+++ b/winsup/cygwin/advapi32.cc
@@ -8,10 +8,6 @@ This software is a copyrighted work licensed under the terms of the
 Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
 details. */
 
-/* This define is required to tell the mingw64 headers (or, FWIW, the
-   Microsoft headers) to omit declspec(dllimport) from advapi declarations. */
-#define _ADVAPI32_
-
 #include "winsup.h"
 #include <winioctl.h>
 #include "shared_info.h"
diff --git a/winsup/cygwin/kernel32.cc b/winsup/cygwin/kernel32.cc
index 2f049951c..9f9aa2784 100644
--- a/winsup/cygwin/kernel32.cc
+++ b/winsup/cygwin/kernel32.cc
@@ -8,10 +8,6 @@ This software is a copyrighted work licensed under the terms of the
 Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
 details. */
 
-/* This define is required to tell the mingw64 headers to omit
-   declspec(dllimport) from all kernel32 function declarations. */
-#define _KERNEL32_
-
 #include "winsup.h"
 #include "shared_info.h"
 #include "ntdll.h"
diff --git a/winsup/cygwin/winlean.h b/winsup/cygwin/winlean.h
index 7d40b8321..2a6f062e5 100644
--- a/winsup/cygwin/winlean.h
+++ b/winsup/cygwin/winlean.h
@@ -11,24 +11,48 @@ details. */
 #ifndef _WINLEAN_H
 #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_
+#define _WINSVC_
 #define __STRALIGN_H_
+#define _ADVAPI32_
+#define _DSGETDCAPI_
+#define _GDI32_
+#define _KERNEL32_
+#define _OLE32_
+#define _SHELL32_
+#define _SPOOL32_
+#define _USER32_
+#define _WINMM_
+#define WINIMPM
+#define WINSOCK_API_LINKAGE
+
 #include <windows.h>
 #include <wincrypt.h>
 #include <lmcons.h>
 #include <ntdef.h>
+
 #undef _WINGDI_H
 #undef _WINUSER_H
 #undef _WINNLS_H
 #undef _WINVER_H
 #undef _WINNETWK_H
 #undef _WINSVC_H
+
+#undef _WINNLS_
+#undef _WINNETWK_
+#undef _WINSVC_
 #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
@@ -37,9 +61,4 @@ details. */
    use this function.  Use GetSystemWindowsDirectoryW. */
 #define GetWindowsDirectoryW dont_use_GetWindowsDirectory
 #define GetWindowsDirectoryA dont_use_GetWindowsDirectory
-/* FILE_SHARE_VALID_FLAGS is a Mingw32 invention not backed by the system
-   headers.  Therefore it's not defined by Mingw64, either. */
-#ifdef __MINGW64_VERSION_MAJOR
-#define FILE_SHARE_VALID_FLAGS (FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE)
-#endif
 #endif /*_WINLEAN_H*/