From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <corinna@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2155)
 id 998493887006; Tue,  7 Apr 2020 17:07:08 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 998493887006
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: utils: override definition of
 PMEM_EXTENDED_PARAMETER
X-Act-Checkin: newlib-cygwin
X-Git-Author: Corinna Vinschen <corinna@vinschen.de>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 3fe9b02ccd6aeb684e39ca3fb9a6fd3ee5ede852
X-Git-Newrev: 3d1360113d2d917124f9715baa9e2cfb6ad96915
Message-Id: <20200407170708.998493887006@sourceware.org>
Date: Tue,  7 Apr 2020 17:07:08 +0000 (GMT)
X-BeenThere: cygwin-cvs@cygwin.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Cygwin core component git logs <cygwin-cvs.cygwin.com>
List-Unsubscribe: <http://cygwin.com/mailman/options/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=unsubscribe>
List-Archive: <https://cygwin.com/pipermail/cygwin-cvs/>
List-Help: <mailto:cygwin-cvs-request@cygwin.com?subject=help>
List-Subscribe: <http://cygwin.com/mailman/listinfo/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=subscribe>
X-List-Received-Date: Tue, 07 Apr 2020 17:07:08 -0000

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=3d1360113d2d917124f9715baa9e2cfb6ad96915

commit 3d1360113d2d917124f9715baa9e2cfb6ad96915
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Tue Apr 7 18:54:59 2020 +0200

    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>

Diff:
---
 winsup/utils/cygpath.cc | 1 +
 winsup/utils/ps.cc      | 1 +
 2 files changed, 2 insertions(+)

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>