diff options
Diffstat (limited to 'sysutils/gnometoaster/patches/patch-aa')
| -rw-r--r-- | sysutils/gnometoaster/patches/patch-aa | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sysutils/gnometoaster/patches/patch-aa b/sysutils/gnometoaster/patches/patch-aa index b704445f181..c49a04de650 100644 --- a/sysutils/gnometoaster/patches/patch-aa +++ b/sysutils/gnometoaster/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/03/25 11:24:28 drochner Exp $ +$NetBSD: patch-aa,v 1.2 2006/03/06 22:16:53 joerg Exp $ --- cdromlow.c.orig Sat Mar 23 19:48:00 2002 +++ cdromlow.c Sat Mar 23 20:10:30 2002 @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/03/25 11:24:28 drochner Exp $ #include <signal.h> #include <unistd.h> -#if !defined( __FreeBSD__) && !defined(__svr4__ ) -+#if !defined( __FreeBSD__) && !defined(__svr4__ ) && !defined(__NetBSD__) ++#if !defined( __FreeBSD__) && !defined(__svr4__ ) && !defined(__NetBSD__) && !defined(__DragonFly__) # include <linux/cdrom.h> #else # include <sys/cdio.h> @@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/03/25 11:24:28 drochner Exp $ /* we provide some macro mappings here. FreeBSD structs are a bit * different to those used by Linux so we will use macros to compensate that */ -#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__NetBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) /* Needed by FreeBSD */ # define CDROM_DATA_TRACK 4 @@ -71,7 +71,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/03/25 11:24:28 drochner Exp $ @@ -148,7 +169,11 @@ entry.cdromlow_tocent_format=CDROM_LBA; ioctl(info->filedescriptor,CDROMREADTOCENTRY,&entry); - #ifndef __FreeBSD__ +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__DragonFly__) +#ifdef __NetBSD__ + if (entry.data->control & CDROM_DATA_TRACK) +#else @@ -133,7 +134,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/03/25 11:24:28 drochner Exp $ @@ -325,7 +372,11 @@ if (ioctl(info->filedescriptor,CDROMREADTOCENTRY,&track)==-1) ok=0; - #ifndef __FreeBSD__ +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__DragonFly__) +#ifdef __NetBSD__ + if (track.data->control & CDROM_DATA_TRACK) +#else |