From 40b37ccccbd6e70104640b103930394b738a705a Mon Sep 17 00:00:00 2001
From: Andrea Odetti <mariofutire@gmail.com>
Date: Sun, 29 Nov 2020 18:02:43 +0000
Subject: [PATCH] Fix compilation error after merge.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
---
 source/linux/data.cpp           | 4 ----
 source/linux/duplicates/Tfe.cpp | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/source/linux/data.cpp b/source/linux/data.cpp
index e5a02c11..6ba24aa8 100644
--- a/source/linux/data.cpp
+++ b/source/linux/data.cpp
@@ -15,7 +15,3 @@ void CheckCpu()
     LogFileOutput("Detected non standard CPU for Apple2 = %d: default = %d, actual = %d\n", apple2Type, defaultCpu, mainCpu);
   }
 }
-
-void alarm_log_too_many_alarms()
-{
-}
diff --git a/source/linux/duplicates/Tfe.cpp b/source/linux/duplicates/Tfe.cpp
index 02125067..415a1468 100644
--- a/source/linux/duplicates/Tfe.cpp
+++ b/source/linux/duplicates/Tfe.cpp
@@ -1,3 +1,4 @@
+#include <StdAfx.h>
 #include "Tfe/Tfe.h"
 
 int tfe_enabled = 0;