[newlib-cygwin/cygwin-3_4-branch] Cygwin: Fix compiling with w32api-headers v11.0.0

Jon Turney jturney@sourceware.org
Mon May 1 18:29:23 GMT 2023


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=1c63eaace825e32f2d03a3a228a40b1019b94c71

commit 1c63eaace825e32f2d03a3a228a40b1019b94c71
Author: Biswapriyo Nath <nathbappai@gmail.com>
Date:   Sun Apr 30 00:03:21 2023 +0530

    Cygwin: Fix compiling with w32api-headers v11.0.0
    
    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 | {
          | ^
    
    (cherry picked from commit 3bee68248fc8e164a8bb6bba3f105b10fdec8a71)

Diff:
---
 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 0f2310882..a4e8b8855 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
 {


More information about the Cygwin-cvs mailing list