lsteamclinet,vrclient_x64: meant to patch these, not edit them directly when merging MR

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>

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;
 

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

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>