sync code with last improvements from OpenBSD

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 */
 

gnu/usr.sbin/mkhybrid/src/mac_label.c

@@ -24,6 +24,9 @@
 #include "mac_label_proto.h"
 #include <mac_label.h>
 
+/* from libhfs_iso/data.h */
+short d_getw(unsigned char *);
+
 int
 gen_mac_label(defer *mac_boot)
 {

gnu/usr.sbin/mkhybrid/src/volume.c

@@ -19,6 +19,11 @@
 #include "write.h"
 #include <errno.h>
 
+/* 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 *));