summaryrefslogtreecommitdiffhomepage
path: root/proto-wine
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2018-12-25 19:27:19 +0100
committerStanislaw Halik <sthalik@misaki.pl>2018-12-25 19:27:19 +0100
commit66685c866a34cee8016599d80565a13192740f02 (patch)
treebf6b623ac673adc66948c5b44b694364c75a3f80 /proto-wine
parent7509b983edb4b95b38089a89305e1d1e988da09b (diff)
fix build
Diffstat (limited to 'proto-wine')
-rw-r--r--proto-wine/opentrack-wrapper-wine-main.cxx6
-rw-r--r--proto-wine/opentrack-wrapper-wine-windows.cxx4
2 files changed, 6 insertions, 4 deletions
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)
{