summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2020-04-07 18:54:59 +0200
committerCorinna Vinschen <corinna@vinschen.de>2020-04-07 19:04:41 +0200
commit3d1360113d2d917124f9715baa9e2cfb6ad96915 (patch)
treeb205cb092bd1c08926ba6b5da9b7df276974c128
parent3fe9b02ccd6aeb684e39ca3fb9a6fd3ee5ede852 (diff)
downloadcygnal-3d1360113d2d917124f9715baa9e2cfb6ad96915.tar.gz
cygnal-3d1360113d2d917124f9715baa9e2cfb6ad96915.tar.bz2
cygnal-3d1360113d2d917124f9715baa9e2cfb6ad96915.zip
Cygwin: utils: override definition of PMEM_EXTENDED_PARAMETER
PMEM_EXTENDED_PARAMETER is defined in the local winlean.h as long as mingw-w64 doesn't define it (in winnt.h). ntdll.h needs the definition for declaring NtMapViewOfSectionEx. cygpath.cc and ps.cc both include ntdll.h but not winlean.h, so they complain about the missing definition. Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
-rw-r--r--winsup/utils/cygpath.cc1
-rw-r--r--winsup/utils/ps.cc1
2 files changed, 2 insertions, 0 deletions
diff --git a/winsup/utils/cygpath.cc b/winsup/utils/cygpath.cc
index ccae98f77..bf77bb2a9 100644
--- a/winsup/utils/cygpath.cc
+++ b/winsup/utils/cygpath.cc
@@ -24,6 +24,7 @@ details. */
#define _WIN32_WINNT 0x0a00
#define WINVER 0x0a00
#define NOCOMATTRIBUTE
+#define PMEM_EXTENDED_PARAMETER PVOID
#include <windows.h>
#include <userenv.h>
#include <shlobj.h>
diff --git a/winsup/utils/ps.cc b/winsup/utils/ps.cc
index 731f72c18..4d7a56d3d 100644
--- a/winsup/utils/ps.cc
+++ b/winsup/utils/ps.cc
@@ -6,6 +6,7 @@ This software is a copyrighted work licensed under the terms of the
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
details. */
+#define PMEM_EXTENDED_PARAMETER PVOID
#include <errno.h>
#include <stdio.h>
#include <locale.h>