From b244cfb633a527f6f362059aada744afcd1c706a Mon Sep 17 00:00:00 2001
From: cebix <>
Date: Fri, 14 Jul 2000 21:42:06 +0000
Subject: [PATCH] - fixed compilation problems

---
 BasiliskII/src/extfs.cpp            |  4 ++--
 BasiliskII/src/include/macos_util.h |  4 +++-
 BasiliskII/src/macos_util.cpp       | 10 ----------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/BasiliskII/src/extfs.cpp b/BasiliskII/src/extfs.cpp
index 74f41307..1b4e2e50 100644
--- a/BasiliskII/src/extfs.cpp
+++ b/BasiliskII/src/extfs.cpp
@@ -120,7 +120,7 @@ const int STACK_SIZE = 0x10000;
 
 // Allocation block and clump size as reported to MacOS (these are of course
 // not the real values and have no meaning on the host OS)
-const int ALBLK_SIZE = 0x4000;
+const int AL_BLK_SIZE = 0x4000;
 const int CLUMP_SIZE = 0x4000;
 
 // Drive number of our pseudo-drive
@@ -1002,7 +1002,7 @@ static int16 fs_volume_mount(uint32 pb)
 	WriteMacInt16(vcb + vcbNmRtDirs, 1);		//!!
 	WriteMacInt16(vcb + vcbNmAlBlks, 0xffff);	//!!
 	WriteMacInt32(vcb + vcbAlBlkSiz, AL_BLK_SIZE);
-	WriteMacInt32(vcb + vcbClpSiz, CLUMPSIZE);
+	WriteMacInt32(vcb + vcbClpSiz, CLUMP_SIZE);
 	WriteMacInt32(vcb + vcbNxtCNID, next_cnid);
 	WriteMacInt16(vcb + vcbFreeBks, 0xffff);	//!!
 	Host2Mac_memcpy(vcb + vcbVN, VOLUME_NAME, 28);
diff --git a/BasiliskII/src/include/macos_util.h b/BasiliskII/src/include/macos_util.h
index 2ab41386..66deea4d 100644
--- a/BasiliskII/src/include/macos_util.h
+++ b/BasiliskII/src/include/macos_util.h
@@ -21,6 +21,8 @@
 #ifndef MACOS_UTIL_H
 #define MACOS_UTIL_H
 
+#include "cpu_emulation.h"
+
 
 /*
  *  Queues
@@ -249,7 +251,7 @@ extern int FindFreeDriveNumber(int num);			// Find first free drive number, star
 extern void MountVolume(void *fh);					// Mount volume with given file handle (see sys.h)
 extern void FileDiskLayout(loff_t size, uint8 *data, loff_t &start_byte, loff_t &real_size);	// Calculate disk image file layout given file size and first 256 data bytes
 
-// Test if basic MacOS initializations are done
+// Test if basic MacOS initializations (of the ROM) are done
 static inline bool HasMacStarted(void)
 {
 	return ReadMacInt32(0xcfc) == 'WLSC';	// Mac warm start flag
diff --git a/BasiliskII/src/macos_util.cpp b/BasiliskII/src/macos_util.cpp
index bad68a66..f38a8afd 100644
--- a/BasiliskII/src/macos_util.cpp
+++ b/BasiliskII/src/macos_util.cpp
@@ -85,16 +85,6 @@ void MountVolume(void *fh)
 }
 
 
-/*
- *  Test if basic MacOS initializations (of the ROM) are done
- */
-
-bool HasMacStarted(void)
-{
-	return ReadMacInt32(0xcfc) == 'WLSC';	// Mac warm start flag
-}
-
-
 /*
  *  Calculate disk image file layout given file size and first 256 data bytes
  */