summarylogtreecommitdiffstats
path: root/0006-AUR-Fix-hwnd-redefinition.patch
blob: 3ee3533fecb9949e1d7bf9dfbcba260bb44f2d52 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
From 535d0c15b54e8b7a30942df6a2325f8f3feac0d4 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 | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/steam_helper/steam.cpp b/steam_helper/steam.cpp
index f99596bc..5378e560 100644
--- a/steam_helper/steam.cpp
+++ b/steam_helper/steam.cpp
@@ -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 <string.h>
 #include <stdio.h>
 #include <limits.h>
diff --git a/vrclient_x64/json_converter.cpp b/vrclient_x64/json_converter.cpp
index aa1573b9..06715afb 100644
--- a/vrclient_x64/json_converter.cpp
+++ b/vrclient_x64/json_converter.cpp
@@ -3,8 +3,10 @@
 
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
+extern "C" {
 #include "windef.h"
 #include "winbase.h"
+}
 
 #undef min
 #undef max
-- 
2.45.2