From 79546240dcac674ef0155038b57d760890b15d29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Wed, 26 Nov 2014 19:45:57 +0100 Subject: Fix FTBFS in kscd on openbsd because missing scsi_cd.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- kscd/libwm/plat_openbsd.c | 9 +++++---- 1 file 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 #include #include -#include #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; -- cgit v1.2.1