From 350edf6e5c1f253a300fd0b7db6591082558d937 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 22 Sep 2014 15:19:01 +0200 Subject: needless compat api breakage --- ftnoir_protocol_ft/ftnoir_protocol_ft.cpp | 4 ++-- ftnoir_protocol_ft/ftnoir_protocol_ft.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ftnoir_protocol_ft') diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp b/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp index d0cbfa97..8b8be63d 100644 --- a/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp +++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp @@ -28,9 +28,9 @@ #include "ftnoir_csv/csv.h" FTNoIR_Protocol::FTNoIR_Protocol() : - shm(FT_MM_DATA, FREETRACK_MUTEX, sizeof(FTHeap)) + shm(FREETRACK_HEAP, FREETRACK_MUTEX, sizeof(FTHeap)) { - pMemData = (FTHeap*) shm.mem; + pMemData = (FTHeap*) shm.ptr(); ProgramName = ""; intGameID = 0; viewsStart = 0; diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.h b/ftnoir_protocol_ft/ftnoir_protocol_ft.h index d7a792b7..dc534fda 100644 --- a/ftnoir_protocol_ft/ftnoir_protocol_ft.h +++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.h @@ -27,7 +27,6 @@ #pragma once #include "ui_ftnoir_ftcontrols.h" #include "facetracknoir/plugin-api.hpp" -#include "fttypes.h" #include #include #include @@ -39,6 +38,7 @@ #include #include "compat/compat.h" #include "facetracknoir/options.h" +#include "fttypes.h" using namespace options; struct settings { -- cgit v1.2.3