DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 8F9D9385DC01
Date: Wed, 1 Apr 2020 10:38:36 +0200
From: Corinna Vinschen <corinna-cygwin AT cygwin DOT com>
To: cygwin AT cygwin DOT com
Subject: Re: [PATCH] winsup/cygwin: remove defines added in mingw-w64 v7.0.0
Message-ID: <20200401083836.GU3261@calimero.vinschen.de>
Mail-Followup-To: cygwin AT cygwin DOT com
References: <CALK-3mJPKThWyTOGucypDisH9psSMiA-RtAoG+Xiq2_GRLGjdQ AT mail DOT gmail DOT com>
MIME-Version: 1.0
In-Reply-To: <CALK-3mJPKThWyTOGucypDisH9psSMiA-RtAoG+Xiq2_GRLGjdQ@mail.gmail.com>
Precedence: list
Reply-To: cygwin AT cygwin DOT com
Content-Type: multipart/mixed; boundary="===============5456899293157847485=="
Errors-To: cygwin-bounces AT cygwin DOT com
Sender: "Cygwin" <cygwin-bounces AT cygwin DOT com>


--===============5456899293157847485==
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="LwbuP8dfxhLLLUfV"
Content-Disposition: inline


--LwbuP8dfxhLLLUfV
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Apr  1 11:20, Biswapriyo Nath via Cygwin wrote:
> Patch file attached.

Thanks, but except for removing DiscardVirtualMemory, this won't work
for now.  The Cygwin w32api headers on Fedora where I'm building
Cygwin are still version 5.0.4.

But thanks all the same.  As soon as the Fedora version gets bumped,
I'll apply this patch.


Corinna


> From fcc8f83f4d47ba9f755725c64218f2f13e9a8e2d Mon Sep 17 00:00:00 2001
> From: Biswapriyo Nath <nathbappai AT gmail DOT com>
> Date: Wed, 1 Apr 2020 11:20:00 +0530
> Subject: [PATCH] winsup/cygwin: remove defines added in mingw-w64 v7.0.0
>=20
> Signed-off-by: Biswapriyo Nath <nathbappai AT gmail DOT com>
> ---
>  winsup/cygwin/mmap.cc   |  3 ---
>  winsup/cygwin/uinfo.cc  |  3 ---
>  winsup/cygwin/winlean.h | 11 -----------
>  3 files changed, 17 deletions(-)
>=20
> diff --git a/winsup/cygwin/mmap.cc b/winsup/cygwin/mmap.cc
> index d8ef037..662489c 100644
> --- a/winsup/cygwin/mmap.cc
> +++ b/winsup/cygwin/mmap.cc
> @@ -1466,9 +1466,6 @@ munlock (const void *addr, size_t len)
>    return ret;
>  }
> =20
> -/* This is required until Mingw-w64 catches up with newer functions. */
> -extern "C" WINAPI DWORD DiscardVirtualMemory (PVOID, SIZE_T);
> -
>  extern "C" int
>  posix_madvise (void *addr, size_t len, int advice)
>  {
> diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
> index bfcce00..2d5de35 100644
> --- a/winsup/cygwin/uinfo.cc
> +++ b/winsup/cygwin/uinfo.cc
> @@ -1912,9 +1912,6 @@ pwdgrp::construct_sid_from_name (cygsid &sid, wchar=
_t *name, wchar_t *sep)
>    return false;
>  }
> =20
> -/* CV 2018-08-28: SidTypeLogonSession is not yet defined in Mingw64. */
> -#define SidTypeLogonSession 11
> -
>  char *
>  pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pld=
ap)
>  {
> diff --git a/winsup/cygwin/winlean.h b/winsup/cygwin/winlean.h
> index 1332cb7..9b30b65 100644
> --- a/winsup/cygwin/winlean.h
> +++ b/winsup/cygwin/winlean.h
> @@ -94,15 +94,4 @@ details. */
>  #define GetWindowsDirectoryW dont_use_GetWindowsDirectory
>  #define GetWindowsDirectoryA dont_use_GetWindowsDirectory
> =20
> -/* For console with xterm compatible mode */
> -/* Not yet defined in Mingw-w64 */
> -#ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
> -#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004
> -#endif /* ENABLE_VIRTUAL_TERMINAL_PROCESSING */
> -#ifndef ENABLE_VIRTUAL_TERMINAL_INPUT
> -#define ENABLE_VIRTUAL_TERMINAL_INPUT 0x0200
> -#endif /* ENABLE_VIRTUAL_TERMINAL_INPUT */
> -#ifndef DISABLE_NEWLINE_AUTO_RETURN
> -#define DISABLE_NEWLINE_AUTO_RETURN 0x0008
> -#endif /* DISABLE_NEWLINE_AUTO_RETURN */
>  #endif /*_WINLEAN_H*/
> --=20
> 2.26.0
>=20

> --
> Problem reports:      https://cygwin.com/problems.html
> FAQ:                  https://cygwin.com/faq/
> Documentation:        https://cygwin.com/docs.html
> Unsubscribe info:     https://cygwin.com/ml/#unsubscribe-simple


--=20
Corinna Vinschen
Cygwin Maintainer

--LwbuP8dfxhLLLUfV
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEoVYPmneWZnwT6kwF9TYGna5ET6AFAl6EUwwACgkQ9TYGna5E
T6AdNQ/7BVBqd93MrrTLIKVAT920QPN3vovqUwXY50Y4SRKCrdO+xvCnfg2AG1pX
oAyS8236Xkt7GS2aI13ycMalCU8+kElDbOWRjMkyEfCeGk6E90E3EFg/gbh6xrp4
fDjzpGmHKDuHgESxpc/a0OspVi2GMqH+AYUS4IPvDZw6rXGwoWxzn/mQCX3vCezc
0Dk92aZTyH4hxCwhWEuc8+t0c5XGNzgdKfOxW+JBvR6Hp3vbXCmeGnMPvqnNi1uN
aNHG/yBaNcYwZb8ndODJbTdoYPvddcPWNuScfZCamDxGgfyOsfONjbfkYiu1Zlmc
4qV1U7ovbjrL7ydV8YbMaQGWoPI+3gKHX9SovijP6m0NX5OUNvFRAttUPe+pK4hR
A7Hc5xJ+iIUivE0CFPfJJYe4m3qz1+vQzpmLWgQvqkJLeN/rrRCct+PKiYrkyoDP
oGd41U3n7a6VKEACUuKLpHx8gksTZEbyuU6b33Q3uDiGRyXnOu6VAyEKUjHkHbMW
3WfcVrvlS3QpQVIstf6L4YHYtm7SUg/ujEGdHjn7hhTu82ivU31HDIM144ocCqPt
tvXTt+kjLVSqq+CeZCZZ8iA7iYYK7pcZAjBQPXKWYSO2QnE6rVQvtgbH3JoYuDix
HEaqZWVfGIdJrNHurJKDUr3yW1NI4eI5CLkBUUDue6fNlauRR1Y=
=2vDe
-----END PGP SIGNATURE-----

--LwbuP8dfxhLLLUfV--

--===============5456899293157847485==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

--
Problem reports:      https://cygwin.com/problems.html
FAQ:                  https://cygwin.com/faq/
Documentation:        https://cygwin.com/docs.html
Unsubscribe info:     https://cygwin.com/ml/#unsubscribe-simple

--===============5456899293157847485==--