From 7df78acb4096eaa82a3212eb028ff63522d2e8b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesu=CC=81s=20A=2E=20A=CC=81lvarez?= Date: Tue, 28 Nov 2017 22:53:29 +0100 Subject: [PATCH 1/2] fix for extfs on 64-bit macOS/iOS --- BasiliskII/src/extfs.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BasiliskII/src/extfs.cpp b/BasiliskII/src/extfs.cpp index 99470e8f..1dc47f94 100644 --- a/BasiliskII/src/extfs.cpp +++ b/BasiliskII/src/extfs.cpp @@ -175,9 +175,9 @@ static uint32 next_cnid = fsUsrCNID; // Next available CNID #if defined __APPLE__ && defined __MACH__ struct crtimebuf { - unsigned long length; + u_int32_t length; struct timespec crtime; -}; +} __attribute__((aligned(4), packed)); static uint32 do_get_creation_time(const char *path) { From 33b061f0f4a01dbe029919fa294f816f16e5f2e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesu=CC=81s=20A=2E=20A=CC=81lvarez?= Date: Thu, 30 Nov 2017 18:03:43 +0100 Subject: [PATCH 2/2] fix indentation --- BasiliskII/src/extfs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BasiliskII/src/extfs.cpp b/BasiliskII/src/extfs.cpp index 1dc47f94..e18d1df1 100644 --- a/BasiliskII/src/extfs.cpp +++ b/BasiliskII/src/extfs.cpp @@ -176,7 +176,7 @@ static uint32 next_cnid = fsUsrCNID; // Next available CNID #if defined __APPLE__ && defined __MACH__ struct crtimebuf { u_int32_t length; - struct timespec crtime; + struct timespec crtime; } __attribute__((aligned(4), packed)); static uint32 do_get_creation_time(const char *path)