mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-06 15:08:57 +02:00
44 lines
1.1 KiB
Plaintext
44 lines
1.1 KiB
Plaintext
From 9c0e39e2efb85dd15eaa7e79126adae4bdbb6343 Mon Sep 17 00:00:00 2001
|
|
From: Alexander von Gluck IV <kallisti5@unixzen.com>
|
|
Date: Tue, 18 May 2021 16:49:20 -0500
|
|
Subject: haiku: fixes and patches, rebased from qemu 3.x
|
|
|
|
|
|
diff --git a/disas/nanomips.c b/disas/nanomips.c
|
|
index a025359..e877de2 100644
|
|
--- a/disas/nanomips.c
|
|
+++ b/disas/nanomips.c
|
|
@@ -30,10 +30,14 @@
|
|
#include "qemu/osdep.h"
|
|
#include "disas/dis-asm.h"
|
|
|
|
+#ifndef __HAIKU__
|
|
typedef int64_t int64;
|
|
typedef uint64_t uint64;
|
|
typedef uint32_t uint32;
|
|
typedef uint16_t uint16;
|
|
+#else
|
|
+#include <SupportDefs.h>
|
|
+#endif
|
|
typedef uint64_t img_address;
|
|
|
|
typedef enum {
|
|
diff --git a/util/notify.c b/util/notify.c
|
|
index 76bab21..7c1ea84 100644
|
|
--- a/util/notify.c
|
|
+++ b/util/notify.c
|
|
@@ -67,6 +67,10 @@ int notifier_with_return_list_notify(NotifierWithReturnList *list, void *data)
|
|
int ret = 0;
|
|
|
|
QLIST_FOREACH_SAFE(notifier, &list->notifiers, node, next) {
|
|
+ #ifdef __HAIKU__
|
|
+ if(notifier->notify == NULL) break;
|
|
+ #endif
|
|
+
|
|
ret = notifier->notify(notifier, data);
|
|
if (ret != 0) {
|
|
break;
|
|
--
|
|
2.37.3
|
|
|