[PATCH] winsup/cygwin: remove defines added in mingw-w64 v7.0.0

[PATCH] winsup/cygwin: remove defines added in mingw-w64 v7.0.0

[Biswapriyo Nath]

[-- Attachment #1: Type: text/plain, Size: 21 bytes --]

Patch file attached.

[-- Attachment #2: 0001-winsup-cygwin-remove-defines-added-in-mingw-w64-v7.0.patch.txt --]
[-- Type: text/plain, Size: 2145 bytes --]

From fcc8f83f4d47ba9f755725c64218f2f13e9a8e2d Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Wed, 1 Apr 2020 11:20:00 +0530
Subject: [PATCH] winsup/cygwin: remove defines added in mingw-w64 v7.0.0

Signed-off-by: Biswapriyo Nath <nathbappai@gmail.com>
---
 winsup/cygwin/mmap.cc   |  3 ---
 winsup/cygwin/uinfo.cc  |  3 ---
 winsup/cygwin/winlean.h | 11 -----------
 3 files changed, 17 deletions(-)

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;
 }
 
-/* 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;
 }
 
-/* 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 *pldap)
 {
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
 
-/* 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*/
-- 
2.26.0

Re: [PATCH] winsup/cygwin: remove defines added in mingw-w64 v7.0.0

[Corinna Vinschen]

[-- Attachment #1: Type: text/plain, Size: 2977 bytes --]

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@gmail.com>
> Date: Wed, 1 Apr 2020 11:20:00 +0530
> Subject: [PATCH] winsup/cygwin: remove defines added in mingw-w64 v7.0.0
> 
> Signed-off-by: Biswapriyo Nath <nathbappai@gmail.com>
> ---
>  winsup/cygwin/mmap.cc   |  3 ---
>  winsup/cygwin/uinfo.cc  |  3 ---
>  winsup/cygwin/winlean.h | 11 -----------
>  3 files changed, 17 deletions(-)
> 
> 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;
>  }
>  
> -/* 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;
>  }
>  
> -/* 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 *pldap)
>  {
> 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
>  
> -/* 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*/
> -- 
> 2.26.0
> 

> --
> 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


-- 
Corinna Vinschen
Cygwin Maintainer

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] winsup/cygwin: remove defines added in mingw-w64 v7.0.0

[Corinna Vinschen]

[-- Attachment #1: Type: text/plain, Size: 911 bytes --]

On Apr  1 10:38, Corinna Vinschen wrote:
> 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.

...which is... now.  I built the w32api packages for Fedora myself, and
given I'm (apparently) the only one building Cygwin on Fedora, that
should be ok.

Next time, please send patches to the cygwin-patches mailing list.  It's
not much of a problem to send them here, but cygwin-patches is the list
dedicated to them :)

Pushed as trivial patch, so no BSD 2-clause license sign-off per
https://cygwin.com/contrib.html required.


Thanks,
Corinna

-- 
Corinna Vinschen
Cygwin Maintainer

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]