[PATCH 0/1] MR1695: setupapi: Use _S_I(READ|WRITE) from sys/stat.h instead of redefining them.

[Alex Henrie (＠alexhenrie)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1695

[PATCH 1/1] setupapi: Use _S_I(READ|WRITE) from sys/stat.h instead of redefining them.

[Alex Henrie]

From: Alex Henrie <alexhenrie24(a)gmail.com>

---
 dlls/setupapi/setupapi_private.h | 4 ----
 dlls/setupapi/setupcab.c         | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h
index 7681348a11c..888b959c2e4 100644
--- a/dlls/setupapi/setupapi_private.h
+++ b/dlls/setupapi/setupapi_private.h
@@ -104,10 +104,6 @@ struct callback_WtoA_context
 
 UINT CALLBACK QUEUE_callback_WtoA( void *context, UINT notification, UINT_PTR, UINT_PTR ) DECLSPEC_HIDDEN;
 
-/* from msvcrt/sys/stat.h */
-#define _S_IWRITE 0x0080
-#define _S_IREAD  0x0100
-
 extern OSVERSIONINFOW OsVersionInfo DECLSPEC_HIDDEN;
 
 extern BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) DECLSPEC_HIDDEN;
diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c
index 59f5f06635e..d6b5f40cfba 100644
--- a/dlls/setupapi/setupcab.c
+++ b/dlls/setupapi/setupcab.c
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <share.h>
+#include <sys/stat.h>
 
 #include "windef.h"
 #include "winbase.h"
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1695