diff options
| author | François Andriot <francois.andriot@free.fr> | 2014-11-26 19:45:57 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2014-11-26 19:45:57 +0100 |
| commit | 79546240dcac674ef0155038b57d760890b15d29 (patch) | |
| tree | 08ddcfcea55e983e1cbd9f071ed62f30ecde5114 | |
| parent | 1761a6cdc450b4bae0ef039fec171c6a8927b1ae (diff) | |
| download | tdemultimedia-79546240dcac674ef0155038b57d760890b15d29.tar.gz tdemultimedia-79546240dcac674ef0155038b57d760890b15d29.zip | |
Fix FTBFS in kscd on openbsd because missing scsi_cd.h
Signed-off-by: François Andriot <francois.andriot@free.fr>
| -rw-r--r-- | kscd/libwm/plat_openbsd.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kscd/libwm/plat_openbsd.c b/kscd/libwm/plat_openbsd.c index 57862841..7ee1100d 100644 --- a/kscd/libwm/plat_openbsd.c +++ b/kscd/libwm/plat_openbsd.c @@ -57,7 +57,6 @@ #include <sys/scsiio.h> #include <scsi/scsi_all.h> #include <scsi/cd.h> -#include <scsi/scsi_cd.h> #include "include/wm_struct.h" #include "include/wm_cdtext.h" @@ -127,10 +126,12 @@ wmcd_open(struct wm_drive *d) find_drive_struct(vendor, model, rev); - (d->init)(d); - d->fd = fd; + if (d->proto->gen_init) { + return (d->proto->gen_init)(d); + } + return (0); } /* wmcd_open() */ @@ -314,7 +315,7 @@ gen_get_cdlen(struct wm_drive *d, int *frames) * Play the CD from one position to another (both in frames.) */ int -gen_play(struct wm_drive *d, int start, int end) +gen_play(struct wm_drive *d, int start, int end, int realstart) { struct ioc_play_msf msf; |