summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/debugger/debugqt.cpp
diff options
context:
space:
mode:
author Michael Zapf <github@mizapf.de>2026-04-17 15:21:32 +0200
committer Michael Zapf <github@mizapf.de>2026-04-17 15:21:32 +0200
commitd3d82c776740320dc29eca249f8cd5b1ae4d1b40 (patch)
tree96d2ab1e717f8fa20f73713a95c3f4ce3fecb4e8 /src/osd/modules/debugger/debugqt.cpp
parent0b24b4c2f6052cea7d612408f4baa58ed63ee290 (diff)
parent0034dde186fa6f594125ac3dc2b5977f18e7a062 (diff)
Merge branch 'master' into floppysound
Diffstat (limited to 'src/osd/modules/debugger/debugqt.cpp')
-rw-r--r--src/osd/modules/debugger/debugqt.cpp18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/osd/modules/debugger/debugqt.cpp b/src/osd/modules/debugger/debugqt.cpp
index aeae07324e4..f14c7d7dc6a 100644
--- a/src/osd/modules/debugger/debugqt.cpp
+++ b/src/osd/modules/debugger/debugqt.cpp
@@ -13,12 +13,6 @@
#if (USE_QTDEBUG)
-#include <vector>
-
-#include <QtWidgets/QApplication>
-#include <QtCore/QAbstractEventDispatcher>
-#include <QtCore/QAbstractNativeEventFilter>
-
#include "emu.h"
#include "config.h"
#include "debugger.h"
@@ -34,6 +28,16 @@
#include "util/xmlfile.h"
+#ifdef __aarch64__
+#include <arm_acle.h> // QtCore/qyieldcpu.h uses __yield() without #including this, causing an error
+#endif
+
+#include <QtWidgets/QApplication>
+#include <QtCore/QAbstractEventDispatcher>
+#include <QtCore/QAbstractNativeEventFilter>
+
+#include <vector>
+
#if defined(SDLMAME_UNIX) || defined(SDLMAME_WIN32)
extern int sdl_entered_debugger;
@@ -70,7 +74,7 @@ public:
virtual void wait_for_debugger(device_t &device, bool firststop) override;
virtual void debugger_update() override;
#if defined(_WIN32) && !defined(SDLMAME_WIN32)
- virtual bool nativeEventFilter(const QByteArray &eventType, void *message, long *) override
+ virtual bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override
{
winwindow_qt_filter(message);
return false;