summarylogtreecommitdiffstats
path: root/0006-AUR-Fix-hwnd-redefinition.patch
diff options
context:
space:
mode:
authorStelios Tsampas2023-10-16 14:49:36 +0300
committerStelios Tsampas2023-10-16 14:49:36 +0300
commit5853b4581da0692a7e3ecae0ecc5db4c8ff2c764 (patch)
treebb0ec77b61dd5a7720b5e7e73ddb0f85e6d70d12 /0006-AUR-Fix-hwnd-redefinition.patch
parent7172df373f7b12e4918e5690704fd447bcd4640e (diff)
downloadaur-5853b4581da0692a7e3ecae0ecc5db4c8ff2c764.tar.gz
[proton-ge-custom] Version GE-Proton8-19
Diffstat (limited to '0006-AUR-Fix-hwnd-redefinition.patch')
-rw-r--r--0006-AUR-Fix-hwnd-redefinition.patch30
1 files changed, 22 insertions, 8 deletions
diff --git a/0006-AUR-Fix-hwnd-redefinition.patch b/0006-AUR-Fix-hwnd-redefinition.patch
index 536235e1bfd8..9cb39e1640b9 100644
--- a/0006-AUR-Fix-hwnd-redefinition.patch
+++ b/0006-AUR-Fix-hwnd-redefinition.patch
@@ -1,18 +1,18 @@
-From 0704b421cb2bcdbf6ad406582214aa0e3f7dd7a1 Mon Sep 17 00:00:00 2001
+From 69dbb7af66fe0e882ba4da996ff5d258b1147cd0 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 | 2 ++
- vrclient_x64/vrclient_x64/json_converter.cpp | 2 ++
- 2 files changed, 4 insertions(+)
+ steam_helper/steam.cpp | 4 ++++
+ vrclient_x64/vrclient_x64/json_converter.cpp | 4 ++++
+ 2 files changed, 8 insertions(+)
diff --git a/steam_helper/steam.cpp b/steam_helper/steam.cpp
-index 65b9c179..01e3b927 100644
+index 8f377fcd..41f4021d 100644
--- a/steam_helper/steam.cpp
+++ b/steam_helper/steam.cpp
-@@ -34,7 +34,9 @@
+@@ -34,10 +34,14 @@
#include "ntstatus.h"
#define WIN32_NO_STATUS
@@ -20,13 +20,27 @@ index 65b9c179..01e3b927 100644
#include <windows.h>
+}
#include <winternl.h>
+ #include <shellapi.h>
++extern "C" {
#include <shlwapi.h>
++}
#include <shlobj.h>
+ #include <string.h>
+ #include <stdio.h>
diff --git a/vrclient_x64/vrclient_x64/json_converter.cpp b/vrclient_x64/vrclient_x64/json_converter.cpp
-index 83fd2ec0..64d209a2 100644
+index fac49d29..f45af786 100644
--- a/vrclient_x64/vrclient_x64/json_converter.cpp
+++ b/vrclient_x64/vrclient_x64/json_converter.cpp
-@@ -1,4 +1,6 @@
+@@ -1,11 +1,15 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+
++extern "C" {
+ #include <windef.h>
+ #include <winbase.h>
++}
+
+ #undef wcsncpy
+extern "C" {
#include <windows.h>
+}