From 719160b9578001edcbb8585c1278ae0fc8ff0e44 Mon Sep 17 00:00:00 2001 From: jca Date: Thu, 7 Sep 2023 01:08:36 +0000 Subject: [PATCH] Fix missing function declarations to let mkhybrid build with clang-16 ok millert@ --- gnu/usr.sbin/mkhybrid/src/desktop.c | 2 ++ gnu/usr.sbin/mkhybrid/src/mac_label.c | 3 +++ gnu/usr.sbin/mkhybrid/src/volume.c | 5 +++++ 3 files changed, 10 insertions(+) diff --git a/gnu/usr.sbin/mkhybrid/src/desktop.c b/gnu/usr.sbin/mkhybrid/src/desktop.c index 62ca669255d..40e258d51bd 100644 --- a/gnu/usr.sbin/mkhybrid/src/desktop.c +++ b/gnu/usr.sbin/mkhybrid/src/desktop.c @@ -36,6 +36,8 @@ /* from "data.h" - libhfs routines */ void d_putw(unsigned char *, short); void d_putl(unsigned char *, long); +/* from volume.c */ +void write_fork(hfsfile *, long); extern hce_mem *hce; /* libhfs/mkisofs extras */ diff --git a/gnu/usr.sbin/mkhybrid/src/mac_label.c b/gnu/usr.sbin/mkhybrid/src/mac_label.c index 0cffafb5285..1e594c1be2d 100644 --- a/gnu/usr.sbin/mkhybrid/src/mac_label.c +++ b/gnu/usr.sbin/mkhybrid/src/mac_label.c @@ -24,6 +24,9 @@ #include "mac_label_proto.h" #include +/* from libhfs_iso/data.h */ +short d_getw(unsigned char *); + int gen_mac_label(defer *mac_boot) { diff --git a/gnu/usr.sbin/mkhybrid/src/volume.c b/gnu/usr.sbin/mkhybrid/src/volume.c index 6f445bac08d..3dc4880c537 100644 --- a/gnu/usr.sbin/mkhybrid/src/volume.c +++ b/gnu/usr.sbin/mkhybrid/src/volume.c @@ -19,6 +19,11 @@ #include "write.h" #include +/* from desktop.c */ +int make_desktop(hfsvol *, int); +/* from libhfs_iso/hfs.c */ +void hfs_vsetbless(hfsvol *, unsigned long); + static hfsvol *vol_save = 0; /* used to "destroy" an HFS volume */ int DECL(copy_to_mac_vol, (hfsvol *, struct directory *)); -- 2.20.1