public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: utils: override definition of PMEM_EXTENDED_PARAMETER
Date: Tue,  7 Apr 2020 17:07:08 +0000 (GMT)	[thread overview]
Message-ID: <20200407170708.998493887006@sourceware.org> (raw)

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>


                 reply	other threads:[~2020-04-07 17:07 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200407170708.998493887006@sourceware.org \
    --to=corinna@sourceware.org \
    --cc=cygwin-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).