public inbox for cygwin-developers@cygwin.com
 help / color / mirror / Atom feed
* [PATCH] Cygwin: Fix compiling with w32api-headers v11.0.0
@ 2023-04-29 13:22 Biswapriyo Nath
  2023-04-29 15:40 ` Jon Turney
  0 siblings, 1 reply; 4+ messages in thread
From: Biswapriyo Nath @ 2023-04-29 13:22 UTC (permalink / raw)
  To: cygwin-developers; +Cc: nathbappai

This solves redefinition of FILE_CS_FLAG_CASE_SENSITIVE_DIR in winnt.h
and fixes the following compiler errors

ntdll.h:523:3: error: expected identifier before numeric constant
  523 |   FILE_CS_FLAG_CASE_SENSITIVE_DIR                       = 0x01
      |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
ntdll.h:522:1: note: to match this ‘{’
  522 | {
      | ^
---
 winsup/cygwin/local_includes/ntdll.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/winsup/cygwin/local_includes/ntdll.h b/winsup/cygwin/local_includes/ntdll.h
index 8c4d008..488e659 100644
--- a/winsup/cygwin/local_includes/ntdll.h
+++ b/winsup/cygwin/local_includes/ntdll.h
@@ -518,11 +518,6 @@ enum
   FILE_RENAME_IGNORE_READONLY_ATTRIBUTE			= 0x40
 };
 
-enum
-{
-  FILE_CS_FLAG_CASE_SENSITIVE_DIR			= 0x01
-};
-
 enum
 {
   FILE_PIPE_QUEUE_OPERATION = 0,
-- 
2.40.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] Cygwin: Fix compiling with w32api-headers v11.0.0
  2023-04-29 13:22 [PATCH] Cygwin: Fix compiling with w32api-headers v11.0.0 Biswapriyo Nath
@ 2023-04-29 15:40 ` Jon Turney
  2023-04-29 18:33   ` Biswapriyo Nath
  0 siblings, 1 reply; 4+ messages in thread
From: Jon Turney @ 2023-04-29 15:40 UTC (permalink / raw)
  To: cygwin-developers, Biswapriyo Nath

On 29/04/2023 14:22, Biswapriyo Nath wrote:
> This solves redefinition of FILE_CS_FLAG_CASE_SENSITIVE_DIR in winnt.h
> and fixes the following compiler errors
> 
> ntdll.h:523:3: error: expected identifier before numeric constant
>    523 |   FILE_CS_FLAG_CASE_SENSITIVE_DIR                       = 0x01
>        |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ntdll.h:522:1: note: to match this ‘{’
>    522 | {
>        | ^
> ---
>   winsup/cygwin/local_includes/ntdll.h | 5 -----
>   1 file changed, 5 deletions(-)
> 
> diff --git a/winsup/cygwin/local_includes/ntdll.h b/winsup/cygwin/local_includes/ntdll.h
> index 8c4d008..488e659 100644
> --- a/winsup/cygwin/local_includes/ntdll.h
> +++ b/winsup/cygwin/local_includes/ntdll.h
> @@ -518,11 +518,6 @@ enum
>     FILE_RENAME_IGNORE_READONLY_ATTRIBUTE			= 0x40
>   };
>   
> -enum
> -{
> -  FILE_CS_FLAG_CASE_SENSITIVE_DIR			= 0x01
> -};
> -

I think this probably needs wrapping in a __MINGW64_VERSION_MAJOR check, 
or the minimum w32api version needs checking in winsup/configure.ac.


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH] Cygwin: Fix compiling with w32api-headers v11.0.0
  2023-04-29 15:40 ` Jon Turney
@ 2023-04-29 18:33   ` Biswapriyo Nath
  2023-05-01 17:19     ` Jon Turney
  0 siblings, 1 reply; 4+ messages in thread
From: Biswapriyo Nath @ 2023-04-29 18:33 UTC (permalink / raw)
  To: cygwin-developers; +Cc: nathbappai

This solves redefinition of FILE_CS_FLAG_CASE_SENSITIVE_DIR in winnt.h
and fixes the following compiler errors

ntdll.h:523:3: error: expected identifier before numeric constant
  523 |   FILE_CS_FLAG_CASE_SENSITIVE_DIR                       = 0x01
      |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
ntdll.h:522:1: note: to match this ‘{’
  522 | {
      | ^
---
 winsup/cygwin/local_includes/ntdll.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/winsup/cygwin/local_includes/ntdll.h b/winsup/cygwin/local_includes/ntdll.h
index 8c4d008..a1a9f7f 100644
--- a/winsup/cygwin/local_includes/ntdll.h
+++ b/winsup/cygwin/local_includes/ntdll.h
@@ -518,10 +518,12 @@ enum
   FILE_RENAME_IGNORE_READONLY_ATTRIBUTE			= 0x40
 };
 
+#if (__MINGW64_VERSION_MAJOR < 11)
 enum
 {
   FILE_CS_FLAG_CASE_SENSITIVE_DIR			= 0x01
 };
+#endif
 
 enum
 {
-- 
2.40.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] Cygwin: Fix compiling with w32api-headers v11.0.0
  2023-04-29 18:33   ` Biswapriyo Nath
@ 2023-05-01 17:19     ` Jon Turney
  0 siblings, 0 replies; 4+ messages in thread
From: Jon Turney @ 2023-05-01 17:19 UTC (permalink / raw)
  To: cygwin-developers, Biswapriyo Nath

On 29/04/2023 19:33, Biswapriyo Nath wrote:
> This solves redefinition of FILE_CS_FLAG_CASE_SENSITIVE_DIR in winnt.h
> and fixes the following compiler errors

Applied. Thanks.


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-05-01 17:19 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-29 13:22 [PATCH] Cygwin: Fix compiling with w32api-headers v11.0.0 Biswapriyo Nath
2023-04-29 15:40 ` Jon Turney
2023-04-29 18:33   ` Biswapriyo Nath
2023-05-01 17:19     ` Jon Turney

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