--- iodev/cdrom.cc.orig 2005-07-13 20:19:27.000000000 +0200
+++ bochs-2.2.1/iodev/cdrom.cc      2005-07-13 20:18:06.000000000 +0200
@@ -109,7 +109,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include <dev/disk.h>
+#include <sys/disk.h>
 #include <errno.h>
 #include <paths.h>
 #include <sys/param.h>

--- iodev/eth_tuntap.cc.orig	2005-07-13 20:58:03.000000000 +0200
+++ bochs-2.2.1/iodev/eth_tuntap.cc	2005-07-13 20:58:31.000000000 +0200
@@ -228,7 +228,7 @@
 bx_tuntap_pktmover_c::sendpkt(void *buf, unsigned io_len)
 {
 #ifdef __APPLE__	//FIXME
-  unsigned int size = write (fd, buf+14, io_len-14);
+  unsigned int size = write (fd, ((unsigned char*)buf)+14, io_len-14);
   if (size != io_len-14) {
     BX_PANIC (("write on tuntap device: %s", strerror (errno)));
   } else {