From 1158d091da96218961c492a2e0acf9e265113710 Mon Sep 17 00:00:00 2001
From: cebix <>
Date: Mon, 16 Oct 2000 17:37:58 +0000
Subject: [PATCH] fixed compilation problems

---
 BasiliskII/src/AmigaOS/main_amiga.cpp         | 1 +
 BasiliskII/src/AmigaOS/prefs_editor_amiga.cpp | 2 +-
 BasiliskII/src/AmigaOS/video_amiga.cpp        | 5 ++---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/BasiliskII/src/AmigaOS/main_amiga.cpp b/BasiliskII/src/AmigaOS/main_amiga.cpp
index d1edaedd..7dba02da 100644
--- a/BasiliskII/src/AmigaOS/main_amiga.cpp
+++ b/BasiliskII/src/AmigaOS/main_amiga.cpp
@@ -125,6 +125,7 @@ extern "C" void ExceptionHandlerAsm(void);
 extern "C" void IllInstrHandler(trap_regs *regs);
 extern "C" void PrivViolHandler(trap_regs *regs);
 extern "C" void quit_emulator(void);
+extern "C" void AsmTriggerNMI(void);
 uint16 EmulatedSR;					// Emulated SR (supervisor bit and interrupt mask)
 
 
diff --git a/BasiliskII/src/AmigaOS/prefs_editor_amiga.cpp b/BasiliskII/src/AmigaOS/prefs_editor_amiga.cpp
index 6ff288c5..98c4f720 100644
--- a/BasiliskII/src/AmigaOS/prefs_editor_amiga.cpp
+++ b/BasiliskII/src/AmigaOS/prefs_editor_amiga.cpp
@@ -27,7 +27,7 @@
 #include <libraries/asl.h>
 #include <libraries/gtlayout.h>
 #include <libraries/Picasso96.h>
-#include <cybergraphx/cybergraphics.h>
+#include <cybergraphics/cybergraphics.h>
 #include <graphics/displayinfo.h>
 #include <devices/ahi.h>
 #include <proto/exec.h>
diff --git a/BasiliskII/src/AmigaOS/video_amiga.cpp b/BasiliskII/src/AmigaOS/video_amiga.cpp
index 12a74737..a20f6174 100644
--- a/BasiliskII/src/AmigaOS/video_amiga.cpp
+++ b/BasiliskII/src/AmigaOS/video_amiga.cpp
@@ -655,9 +655,8 @@ static __saveds void periodic_func(void)
 					case IDCMP_RAWKEY:
 						if (qualifier & IEQUALIFIER_REPEAT)	// Keyboard repeat is done by MacOS
 							break;
-						if ((qualifier & (IEQUALIFIER_LALT | IEQUALIFIER_LSHIFT | IEQUALIFIER_CONTROL)) == 
-						    (IEQUALIFIER_LALT | IEQUALIFIER_LSHIFT | IEQUALIFIER_CONTROL))
-						 && code == 0x5f) {
+						if ((qualifier & (IEQUALIFIER_LALT | IEQUALIFIER_LSHIFT | IEQUALIFIER_CONTROL)) ==
+						    (IEQUALIFIER_LALT | IEQUALIFIER_LSHIFT | IEQUALIFIER_CONTROL) && code == 0x5f) {
 							SetInterruptFlag(INTFLAG_NMI);
 							TriggerInterrupt();
 							break;