From 66685c866a34cee8016599d80565a13192740f02 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 25 Dec 2018 19:27:19 +0100
Subject: fix build

---
 proto-wine/opentrack-wrapper-wine-main.cxx    | 6 +++---
 proto-wine/opentrack-wrapper-wine-windows.cxx | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'proto-wine')

diff --git a/proto-wine/opentrack-wrapper-wine-main.cxx b/proto-wine/opentrack-wrapper-wine-main.cxx
index 491cc917..84ef57ab 100644
--- a/proto-wine/opentrack-wrapper-wine-main.cxx
+++ b/proto-wine/opentrack-wrapper-wine-main.cxx
@@ -30,7 +30,7 @@ enum Axis {
 #define SHM_TYPE_NAME shm_impl_unix
 #define SHM_FUN_PREFIX shm_impl_unix_
 #define SHMXX_TYPE_NAME mem_unix
-#define SHM_WIN32_INIT
+#define SHM_WIN32_INIT 0
 #include "compat/shm.hpp"
 
 void create_registry_key(void);
@@ -56,7 +56,7 @@ int main(void)
 
     while (!mem_unix.stop)
     {
-        MEMBAR();
+        COMPILER_BARRIER();
         data.Yaw = -mem_unix.data[Yaw];
         data.Pitch = -mem_unix.data[Pitch];
         data.Roll = mem_unix.data[Roll];
@@ -68,7 +68,7 @@ int main(void)
         mem_unix.gameid = mem_wine.GameID;
         for (int i = 0; i < 8; i++)
             mem_wine.table[i] = mem_wine.table[i];
-        MEMBAR();
+        COMPILER_BARRIER();
         (void)usleep(4 * 1000);
     }
 }
diff --git a/proto-wine/opentrack-wrapper-wine-windows.cxx b/proto-wine/opentrack-wrapper-wine-windows.cxx
index a18900c3..063e35df 100644
--- a/proto-wine/opentrack-wrapper-wine-windows.cxx
+++ b/proto-wine/opentrack-wrapper-wine-windows.cxx
@@ -9,9 +9,11 @@
 
 #include "wine-shm.h"
 #include "compat/library-path.hpp"
+
 #include <cstring>
 
-using std::strcat;
+#include <windows.h>
+#include <winreg.h>
 
 static void write_path(const char* key, const char* subkey)
 {
-- 
cgit v1.2.3