From b3da5c6698d4ec39d62062d23f1da79f9c359cdf Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Mon, 7 Jan 2019 13:15:30 +0100
Subject: Revert "compat/shm, proto/wine: remove duplication"

This reverts commit bab093ebbe392927a92ef201fe60344d5c1191dd.
---
 proto-ft/ftnoir_protocol_ft.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'proto-ft')

diff --git a/proto-ft/ftnoir_protocol_ft.h b/proto-ft/ftnoir_protocol_ft.h
index a01ff722..0056721c 100644
--- a/proto-ft/ftnoir_protocol_ft.h
+++ b/proto-ft/ftnoir_protocol_ft.h
@@ -19,7 +19,7 @@
 #include <cinttypes>
 #include "freetrackclient/fttypes.h"
 
-#include "compat/shm.hpp"
+#include "compat/shm.h"
 #include "options/options.hpp"
 
 #include <memory>
@@ -46,7 +46,7 @@ public:
     QString game_name() override;
 private:
     settings s;
-    mem shm { FREETRACK_HEAP, FREETRACK_MUTEX, sizeof(FTHeap) };
+    shm_wrapper shm { FREETRACK_HEAP, FREETRACK_MUTEX, sizeof(FTHeap) };
     FTHeap* pMemData { (FTHeap*) shm.ptr() };
 
     QProcess dummyTrackIR;
@@ -66,8 +66,8 @@ class FTControls: public IProtocolDialog
     Q_OBJECT
 public:
     FTControls();
-    void register_protocol(IProtocol *) override {}
-    void unregister_protocol() override {}
+    void register_protocol(IProtocol *) {}
+    void unregister_protocol() {}
 private:
     Ui::UICFTControls ui;
     settings s;
-- 
cgit v1.2.3