Hello,
while experimenting with TinyCC I ran into some problems with fltwinerror.h.
Best regards
Oleg Tolmatcev
From b8a4fcb417c7ee8063d74d0e4b29a50d5484278f Mon Sep 17 00:00:00 2001
From: Oleg Tolmatcev <oleg.tolmat...@gmail.com>
Date: Fri, 29 Dec 2023 14:15:46 +0100
Subject: [PATCH] headers: do not include fltwinerror.h in winerror.h
---
mingw-w64-headers/include/fltwinerror.h | 4 +++-
mingw-w64-headers/include/winerror.h | 8 ++------
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/mingw-w64-headers/include/fltwinerror.h
b/mingw-w64-headers/include/fltwinerror.h
index d0dee925..e9c1a871 100644
--- a/mingw-w64-headers/include/fltwinerror.h
+++ b/mingw-w64-headers/include/fltwinerror.h
@@ -6,7 +6,8 @@
#ifndef _FLT_WINERROR_
#define _FLT_WINERROR_
-#if NTDDI_VERSION < NTDDI_VISTA || defined (__IN__WINERROR_)
+#if NTDDI_VERSION < NTDDI_VISTA
+#ifndef FACILITY_USERMODE_FILTER_MANAGER
#define FILTER_HRESULT_FROM_FLT_NTSTATUS(x) (NT_ASSERT((x & 0xfff0000) ==
0x001c0000),(HRESULT) (((x) & 0x8000ffff) | (FACILITY_USERMODE_FILTER_MANAGER
<< 16)))
#define FACILITY_USERMODE_FILTER_MANAGER 0x1f
@@ -45,3 +46,4 @@
#endif
#endif
+#endif
diff --git a/mingw-w64-headers/include/winerror.h
b/mingw-w64-headers/include/winerror.h
index cab8dbad..6ac6aee6 100755
--- a/mingw-w64-headers/include/winerror.h
+++ b/mingw-w64-headers/include/winerror.h
@@ -5,8 +5,8 @@
*/
#ifndef _WINERROR_
#define _WINERROR_
-
-#define __IN__WINERROR_ 1
+
+#include <specstrings.h>
#define FACILITY_NULL 0
#define FACILITY_RPC 1
@@ -4736,8 +4736,4 @@ __CRT_INLINE HRESULT HRESULT_FROM_WIN32(__LONG32 x) {
return x <= 0 ? (HRESULT)x
#define DWRITE_E_DOWNLOADFAILED _HRESULT_TYPEDEF_(0x8898500FL)
#define DWRITE_E_TOOMANYDOWNLOADS _HRESULT_TYPEDEF_(0x88985010L)
-#include <fltwinerror.h>
-
-#undef __IN__WINERROR_
-
#endif /* _WINERROR_. */
--
2.43.0.windows.1
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
