From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.13]) by sourceware.org (Postfix) with ESMTPS id 8F9D9385DC01 for ; Wed, 1 Apr 2020 08:38:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 8F9D9385DC01 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=cygwin.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=corinna-cygwin@cygwin.com Received: from calimero.vinschen.de ([24.134.7.25]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MjjGX-1iwMlS10qR-00lG0w for ; Wed, 01 Apr 2020 10:38:37 +0200 Received: by calimero.vinschen.de (Postfix, from userid 500) id AB465A805A2; Wed, 1 Apr 2020 10:38:36 +0200 (CEST) Date: Wed, 1 Apr 2020 10:38:36 +0200 From: Corinna Vinschen To: cygwin@cygwin.com Subject: Re: [PATCH] winsup/cygwin: remove defines added in mingw-w64 v7.0.0 Message-ID: <20200401083836.GU3261@calimero.vinschen.de> Reply-To: cygwin@cygwin.com Mail-Followup-To: cygwin@cygwin.com References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="LwbuP8dfxhLLLUfV" Content-Disposition: inline In-Reply-To: X-Provags-ID: V03:K1:k/AmCgL3RO3VmVFMGO4GwvgWKY+2oT1ZLkG6icm0NTcCqwjA2nu +CnRDeXL3unpgd8LZEuEy9ASqNVBzO8NR3C1D7msBO32a4AW6eh/UGiAP3J5QELnSZymk7O akCi4p4evbNwNoxIi9WBBc/1+6Mg3NB1+lJZvK6G6voKAVIoGjjo0peaGGcdsGctv92uFul i24VkS7tOmpa8oWgHcY3g== X-UI-Out-Filterresults: notjunk:1;V03:K0:MmTJL+U9kMo=:j+94kMfJsLoOJcjsoPntHl Fa9Pl9FHNhNuWb9n6xw31bYIMCXZjX5paXkw91XmANQuz97fdEnxXz3TeV38CYEicxg/M7CNy Cb7XTAYXFCUpjGeDc9dEn/DQRu8tceLSDHbZqVerTU6pvYutFbQfylRwK7Qi6MGPwHMoCOMDV M89YJSxonf9rxhKhMfV3p4CHoepfkyOkiKiX9DAARbF4McwCfCkt13+lOXUdReah65WhYnwJL JgtcVCjttG9SGh8jb6aqni851V1gO7x+t+IjclomzBtEGh4OMunmwcgWuF3Xan4wekcJE1gq+ 21PNRPRlnNYeb7bpScDdOfyFb5fBSGaxEVwW0cO28xus6TFrfHz5eSOcFRQR/Tf8xoQKTSqzC nbReXu/UO47JudE1Q1p5oPo3v6ftOD/uC5RIyvq+SepU35eYuKoLTtjCqja+S2X+hfmPUci+2 EjdFVcesHhrlVI3zuukC6vpIAujFN+yvh2Tpnk9zI49kqjTXLS01syLqk2JCbX2iCodYniVXk Vc5oyHK+SOcMHnNGJ14dO7UOaP9QJMd0Czv9c1o6xxcdDgoTK97+Cim5aaqiQA0Cn4hiKQVps M8nCvzgWb3mbghsAWfwsfDd351qbseLLbcQbIKa3lS6ClVO7yVOgdlXJvi9QK4h3x8H28Irma cRvSTSuN2KAQ5I7LeDi01g2ncMxVOrwODMrHDsuyWxzsVuW1mvGCRcQig7OhxH2QI8WGm8jCH jeNA6MP7Ia3bPEfyQDikbJG063z+i/UqP2ma5RysPr1m/lqchRTxiTlDdQtvKJN89z9Epdgho K0zSyE7uUdfRqmSv2MuXSl+4ROTh8YatSc1u0tz37+oXUrCNXiOuBKJ0v/0YkvpL8kI+PWo X-Spam-Status: No, score=-104.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, GOOD_FROM_CORINNA_CYGWIN, KAM_DMARC_STATUS, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: cygwin@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: General Cygwin discussions and problem reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Apr 2020 08:38:40 -0000 --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 > 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 > --- > 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--