MSYS2-packages/msys2-runtime-3.3/0045-Cygwin-Fix-compiling-with-w32api-headers-v11.0.0.patch

41 lines
1.1 KiB
Diff
Raw Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

From 788b777bdf938e38355ae19b22a9b6907046a24f Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Sun, 30 Apr 2023 00:03:21 +0530
Subject: [PATCH 45/N] Cygwin: Fix compiling with w32api-headers v11.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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)
---
winsup/cygwin/ntdll.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/winsup/cygwin/ntdll.h b/winsup/cygwin/ntdll.h
index 0510d83..9358fc0 100644
--- a/winsup/cygwin/ntdll.h
+++ b/winsup/cygwin/ntdll.h
@@ -513,10 +513,12 @@ enum
FILE_RENAME_IGNORE_READONLY_ATTRIBUTE = 0x40
};
+#if (__MINGW64_VERSION_MAJOR < 11)
enum
{
FILE_CS_FLAG_CASE_SENSITIVE_DIR = 0x01
};
+#endif
enum
{