blob: c29873516245ebfc4ba851f6f618f0f4f470880c (
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
49
50
51
52
|
From 6a4327529c5f5980c7cf21377da8fc60cbe2675d 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/vrclient_x64/json_converter.cpp | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/steam_helper/steam.cpp b/steam_helper/steam.cpp
index 8f377fcd..41f4021d 100644
--- a/steam_helper/steam.cpp
+++ b/steam_helper/steam.cpp
@@ -34,10 +34,14 @@
#include "ntstatus.h"
#define WIN32_NO_STATUS
+extern "C" {
#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 fac49d29..f45af786 100644
--- a/vrclient_x64/vrclient_x64/json_converter.cpp
+++ b/vrclient_x64/vrclient_x64/json_converter.cpp
@@ -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>
+}
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(vrclient);
--
2.42.0
|