diff options
| author | anholt <anholt@FreeBSD.org> | 2003-01-11 07:59:22 +0800 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2003-01-11 07:59:22 +0800 |
| commit | 3431b3e73ed3d24e24513c8284dbcea112d6acac (patch) | |
| tree | 8bb2479509be3cbb0508be5ddb5479c3c0b39ae2 /emulators/bochs/files/patch-cdrom.cc | |
| parent | c5440b5492fba46628ad53ce61d0de3382b0ad1a (diff) | |
| download | freebsd-ports-gnome-3431b3e73ed3d24e24513c8284dbcea112d6acac.tar.gz freebsd-ports-gnome-3431b3e73ed3d24e24513c8284dbcea112d6acac.tar.zst freebsd-ports-gnome-3431b3e73ed3d24e24513c8284dbcea112d6acac.zip | |
Update bochs port to 2.0.1, take maintainership.
PR: 46937
Submitted by: Ports Fury (PR), Keith Jones (patch-cdrom.cc)
Diffstat (limited to 'emulators/bochs/files/patch-cdrom.cc')
| -rw-r--r-- | emulators/bochs/files/patch-cdrom.cc | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/emulators/bochs/files/patch-cdrom.cc b/emulators/bochs/files/patch-cdrom.cc new file mode 100644 index 000000000000..808753a0db78 --- /dev/null +++ b/emulators/bochs/files/patch-cdrom.cc @@ -0,0 +1,41 @@ +--- iodev/cdrom.cc Sat Dec 14 21:29:42 2002 ++++ iodev/cdrom.cc Fri Jan 3 13:21:31 2003 +@@ -101,6 +101,8 @@ + #include <sys/cdio.h> + #include <sys/ioctl.h> + #include <sys/disklabel.h> ++// ntohl(x) et al have been moved out of sys/param.h in FreeBSD 5 ++#include <netinet/in.h> + + // XXX + #define BX_CD_FRAMESIZE 2048 +@@ -881,7 +883,7 @@ + t.data_len = sizeof(tocentry); + t.data = &tocentry; + +- if (ioctl (fd, CDIOREADTOCENTRYS, &tocentry) < 0) ++ if (ioctl (fd, CDIOREADTOCENTRYS, &t) < 0) + BX_PANIC(("cdrom: read_toc: READTOCENTRY failed.")); + + buf[len++] = 0; // Reserved +@@ -910,7 +912,7 @@ + t.data_len = sizeof(tocentry); + t.data = &tocentry; + +- if (ioctl (fd, CDIOREADTOCENTRYS, &tocentry) < 0) ++ if (ioctl (fd, CDIOREADTOCENTRYS, &t) < 0) + BX_PANIC(("cdrom: read_toc: READTOCENTRY lead-out failed.")); + + buf[len++] = 0; // Reserved +@@ -1123,9 +1125,8 @@ + } + #elif defined(__FreeBSD__) + { +- // Read the TOC to get the data size, since disklabel doesn't appear +- // to work, sadly. +- // Keith Jones, 16 January 2000 ++ // Read the TOC to get the size of the data track. ++ // Keith Jones <freebsd.dev@blueyonder.co.uk>, 16 January 2000 + + #define MAX_TRACKS 100 + |