From 2f1786653cbb3cc076f64626973f5e4fd4701568 Mon Sep 17 00:00:00 2001
From: GloriousEggroll <gloriouseggroll@gmail.com>
Date: Sun, 18 Oct 2026 23:15:52 -0600
Subject: [PATCH] lsteamclinet,vrclient_x64: meant to patch these, not edit
 them directly when merging MR

---
 lsteamclient/unix_private.h     | 2 --
 lsteamclient/unixlib.cpp        | 4 +---
 vrclient_x64/json_converter.cpp | 2 --
 vrclient_x64/unix_private.h     | 2 --
 4 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/lsteamclient/unix_private.h b/lsteamclient/unix_private.h
index 038f988b..78e128bc 100644
--- a/lsteamclient/unix_private.h
+++ b/lsteamclient/unix_private.h
@@ -3,8 +3,6 @@
 
 #include <stdarg.h>
 #include <stddef.h>
-/* libc++ needs the C wide-character declarations before the Wine headers. */
-#include <wchar.h>
 
 #include <windef.h>
 #include <winbase.h>
diff --git a/lsteamclient/unixlib.cpp b/lsteamclient/unixlib.cpp
index d32bf64d..a65b5c45 100644
--- a/lsteamclient/unixlib.cpp
+++ b/lsteamclient/unixlib.cpp
@@ -1,5 +1,3 @@
-/* libc++ needs the C wide-character declarations before the Wine headers. */
-#include <wchar.h>
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
 #include "unix_private.h"
@@ -874,7 +872,7 @@ static void collapse_path( WCHAR *path, UINT mark )
     for (p = path; *p; p++) if (*p == '/') *p = '\\';
 
     /* collapse duplicate backslashes */
-    next = path + (std::max)( 1u, mark );
+    next = path + std::max( 1u, mark );
     for (p = next; *p; p++) if (*p != '\\' || next[-1] != '\\') *next++ = *p;
     *next = 0;
 
diff --git a/vrclient_x64/json_converter.cpp b/vrclient_x64/json_converter.cpp
index 9e07e180..3767da46 100644
--- a/vrclient_x64/json_converter.cpp
+++ b/vrclient_x64/json_converter.cpp
@@ -1,7 +1,5 @@
 #include <stdarg.h>
 #include <stddef.h>
-/* libc++ needs the C wide-character declarations before the Wine headers. */
-#include <wchar.h>
 
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
diff --git a/vrclient_x64/unix_private.h b/vrclient_x64/unix_private.h
index 682fc9ef..cace710f 100644
--- a/vrclient_x64/unix_private.h
+++ b/vrclient_x64/unix_private.h
@@ -3,8 +3,6 @@
 
 #include <stdarg.h>
 #include <stddef.h>
-/* libc++ needs the C wide-character declarations before the Wine headers. */
-#include <wchar.h>
 
 #include <windef.h>
 #include <winbase.h>