diff options
| author | Stelios Tsampas | 2024-03-09 19:14:17 +0200 |
|---|---|---|
| committer | Stelios Tsampas | 2024-03-09 21:30:32 +0200 |
| commit | 4e8335893bfb194a6ea8e6558eb9f51411522726 (patch) | |
| tree | 2edd9f5789d4736c2e1b6cdc4675c735bf1609ab /0006-AUR-Fix-hwnd-redefinition.patch | |
| parent | 7591cf78bb97bde29742f9f91b2f9794ebe27b9f (diff) | |
| download | aur-4e8335893bfb194a6ea8e6558eb9f51411522726.tar.gz | |
[proton-ge-custom] Version GE-Proton9-1
Diffstat (limited to '0006-AUR-Fix-hwnd-redefinition.patch')
| -rw-r--r-- | 0006-AUR-Fix-hwnd-redefinition.patch | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/0006-AUR-Fix-hwnd-redefinition.patch b/0006-AUR-Fix-hwnd-redefinition.patch index d79f1450703f..e4bbc149ddc2 100644 --- a/0006-AUR-Fix-hwnd-redefinition.patch +++ b/0006-AUR-Fix-hwnd-redefinition.patch @@ -1,52 +1,48 @@ -From 5ec555d42c190e43a83eabb6bc226dd9f3d701ee Mon Sep 17 00:00:00 2001 +From 87a579ed3760d19cd10e54334416d6d25e9d3bef Mon Sep 17 00:00:00 2001 From: Stelios Tsampas <loathingkernel@gmail.com> Date: Thu, 28 Sep 2023 14:16:04 +0300 Subject: [PATCH 6/6] AUR: Fix hwnd redefinition --- steam_helper/steam.cpp | 4 ++++ - vrclient_x64/json_converter.cpp | 4 ++++ - 2 files changed, 8 insertions(+) + vrclient_x64/json_converter.cpp | 2 ++ + 2 files changed, 6 insertions(+) diff --git a/steam_helper/steam.cpp b/steam_helper/steam.cpp -index 4700a1af..d6214df6 100644 +index 59ac90c3..38e42b75 100644 --- a/steam_helper/steam.cpp +++ b/steam_helper/steam.cpp -@@ -34,10 +34,14 @@ +@@ -34,11 +34,15 @@ #include "ntstatus.h" #define WIN32_NO_STATUS +extern "C" { #include <windows.h> +} + #include <winsvc.h> #include <winternl.h> #include <shellapi.h> +extern "C" { #include <shlwapi.h> +} - #include <shlobj.h> #include <string.h> #include <stdio.h> + #include <limits.h> diff --git a/vrclient_x64/json_converter.cpp b/vrclient_x64/json_converter.cpp -index 627fbbb4..3b3ccf15 100644 +index 7d6b4f66..c5533d79 100644 --- a/vrclient_x64/json_converter.cpp +++ b/vrclient_x64/json_converter.cpp -@@ -1,11 +1,15 @@ - #include <stdarg.h> - #include <stddef.h> +@@ -3,8 +3,10 @@ + #include "ntstatus.h" + #define WIN32_NO_STATUS +extern "C" { - #include <windef.h> - #include <winbase.h> -+} - - #undef wcsncpy -+extern "C" { - #include <windows.h> + #include "windef.h" + #include "winbase.h" +} - #include <wine/debug.h> - WINE_DEFAULT_DEBUG_CHANNEL(vrclient); + #undef min + #undef max -- -2.43.1 +2.44.0 |