From 1bf664f241fd00769d13aafc392d18b504428008 Mon Sep 17 00:00:00 2001
From: Lars Toenning <dev@ltoenning.de>
Date: Sat, 1 Nov 2025 11:59:23 +0100
Subject: [PATCH] build: Fix build on Windows

---
 src/misc/datacache.cpp                                  | 2 ++
 src/misc/datacache.h                                    | 2 +-
 src/misc/simulation/settings/xswiftbussettingsqtfree.h  | 1 +
 src/plugins/simulator/flightgear/flightgearmpaircraft.h | 2 +-
 src/xswiftbus/dbusconnection.h                          | 5 +++++
 src/xswiftbus/dbusserver.h                              | 4 ++++
 6 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/misc/datacache.cpp b/src/misc/datacache.cpp
index 36fbe0c6d..036d314bb 100644
--- a/src/misc/datacache.cpp
+++ b/src/misc/datacache.cpp
@@ -351,6 +351,8 @@ namespace swift::misc
         : m_basename(basename), m_session(std::make_unique<Session>(m_basename + "/.session"))
     {}
 
+    CDataCacheRevision::~CDataCacheRevision() = default; // Explicitly in cpp file
+
     CDataCacheRevision::LockGuard CDataCacheRevision::beginUpdate(const QMap<QString, qint64> &timestamps,
                                                                   bool updateUuid, bool pinsOnly)
     {
diff --git a/src/misc/datacache.h b/src/misc/datacache.h
index ccb823ca7..3e8ae03ae 100644
--- a/src/misc/datacache.h
+++ b/src/misc/datacache.h
@@ -83,7 +83,7 @@ namespace swift::misc
         CDataCacheRevision(const QString &basename);
 
         //! Destructor.
-        ~CDataCacheRevision() = default;
+        ~CDataCacheRevision();
 
         //! @{
         //! Non-copyable.
diff --git a/src/misc/simulation/settings/xswiftbussettingsqtfree.h b/src/misc/simulation/settings/xswiftbussettingsqtfree.h
index 14838b5d9..43b1bf537 100644
--- a/src/misc/simulation/settings/xswiftbussettingsqtfree.h
+++ b/src/misc/simulation/settings/xswiftbussettingsqtfree.h
@@ -4,6 +4,7 @@
 #ifndef SWIFT_MISC_SIMULATION_SETTINGS_CXSWIFTBUSSETTINGSQTFREE_H
 #define SWIFT_MISC_SIMULATION_SETTINGS_CXSWIFTBUSSETTINGSQTFREE_H
 
+#include <algorithm>
 #include <chrono>
 #include <string>
 
diff --git a/src/plugins/simulator/flightgear/flightgearmpaircraft.h b/src/plugins/simulator/flightgear/flightgearmpaircraft.h
index 1f71a1a38..21cf5bb49 100644
--- a/src/plugins/simulator/flightgear/flightgearmpaircraft.h
+++ b/src/plugins/simulator/flightgear/flightgearmpaircraft.h
@@ -23,7 +23,7 @@ namespace swift::simplugin::flightgear
     {
     public:
         //! Constructor
-        CFlightgearMPAircraft();
+        CFlightgearMPAircraft() = default;
 
         //! Constructor providing initial situation/parts
         CFlightgearMPAircraft(const swift::misc::simulation::CSimulatedAircraft &aircraft,
diff --git a/src/xswiftbus/dbusconnection.h b/src/xswiftbus/dbusconnection.h
index f8812ae59..5669bd868 100644
--- a/src/xswiftbus/dbusconnection.h
+++ b/src/xswiftbus/dbusconnection.h
@@ -4,6 +4,11 @@
 #ifndef SWIFT_SIM_XSWIFTBUS_DBUSCONNECTION_H
 #define SWIFT_SIM_XSWIFTBUS_DBUSCONNECTION_H
 
+#ifndef NOMINMAX
+// windows.h min/max might be imported via dbus.h
+#    define NOMINMAX
+#endif
+
 #include <dbus/dbus.h>
 #include <event2/event.h>
 
diff --git a/src/xswiftbus/dbusserver.h b/src/xswiftbus/dbusserver.h
index 04dcae7ff..7711d0047 100644
--- a/src/xswiftbus/dbusserver.h
+++ b/src/xswiftbus/dbusserver.h
@@ -4,6 +4,10 @@
 #ifndef SWIFT_SIM_XSWIFTBUS_DBUSSERVER_H
 #define SWIFT_SIM_XSWIFTBUS_DBUSSERVER_H
 
+#ifndef NOMINMAX
+#    define NOMINMAX
+#endif
+
 #include <dbus/dbus.h>
 #include <event2/event.h>