That's odd, I attached it in the first email sent Aug 25.  Here's the patch
inline with my email and attached again

>From 2ba8f0e43213f09f85cf653a8f0a726d9873399d Mon Sep 17 00:00:00 2001
From: Jonathan Marler <johnnymar...@gmail.com>
Date: Wed, 25 Aug 2021 10:35:19 -0600
Subject: [PATCH] wtypes.h: replace #include <...> with #include "..." for
rpc
 headers

This replaces the include style for rpc.h and rpcndr.h inside the wtypes.h
header. I found this issue when trying to compile my WindowsNfs project
found here: https://github.com/marler8997/WindowsNfs.  This project
contains a file named "Rpc.h".  This broke the mingw header files because
wtypes.h ends up including my file instead of the one in the toolchain.  I
also verified that if I had a file named rpcndr.h in my project then the
same issue occured.  By changing these 2 lines to use #include "...",
projects can have files named rpc.h and rpcndr.h and include <windows.h>
without breaking the headers.

Signed-off-by: Jonathan Marler <johnnymar...@gmail.com>
---
 mingw-w64-headers/include/wtypes.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mingw-w64-headers/include/wtypes.h
b/mingw-w64-headers/include/wtypes.h
index 773716df8..fd60edb01 100644
--- a/mingw-w64-headers/include/wtypes.h
+++ b/mingw-w64-headers/include/wtypes.h
@@ -4,8 +4,8 @@
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
 #endif
-#include <rpc.h>
-#include <rpcndr.h>
+#include "rpc.h"
+#include "rpcndr.h"
 #endif

 #ifndef COM_NO_WINDOWS_H
-- 
2.25.4


On Fri, Sep 3, 2021 at 3:54 PM Jacek Caban <ja...@codeweavers.com> wrote:

> Hi Jonathan,
>
> On 9/3/21 11:48 PM, Jonathan Marler wrote:
> > Been another 4 days, anyone able to bring this patch in or review?
>
>
> Your patch never arrived to the mailing list, it looks like the
> attachment is missing.
>
>
> Jacek
>
>

_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to