67 lines
1.9 KiB
Text
67 lines
1.9 KiB
Text
$NetBSD: patch-aa,v 1.2 2005/11/20 20:10:44 dhowland Exp $
|
|
|
|
--- disc/cdrommodule.c.orig 2003-06-23 15:26:16.000000000 -0400
|
|
+++ disc/cdrommodule.c
|
|
@@ -41,7 +41,7 @@
|
|
#include <linux/cdrom.h>
|
|
#endif
|
|
|
|
-#if defined(sun) || defined(__FreeBSD__) || defined(__OpenBSD__)
|
|
+#if defined(sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
|
|
#include <sys/cdio.h>
|
|
#endif
|
|
|
|
@@ -67,7 +67,7 @@
|
|
#define CDDB_DEFAULT_CDROM_DEVICE "/dev/cdrom"
|
|
#define CDDB_DEFAULT_CDROM_FLAGS 0
|
|
|
|
-#elif defined(__OpenBSD__)
|
|
+#elif defined(__OpenBSD__) || defined(__NetBSD__)
|
|
|
|
#define CDDB_TOC_HEADER_STRUCT ioc_toc_header
|
|
#define CDDB_STARTING_TRACK_FIELD starting_track
|
|
@@ -136,7 +136,7 @@ static PyObject *cdrom_toc_entry(PyObjec
|
|
int cdrom_fd;
|
|
unsigned char track;
|
|
|
|
-#if defined(__OpenBSD__)
|
|
+#if defined(__OpenBSD__) || defined(__NetBSD__)
|
|
struct cd_toc_entry data;
|
|
#endif
|
|
|
|
@@ -148,7 +148,7 @@ static PyObject *cdrom_toc_entry(PyObjec
|
|
entry.CDDB_TRACK_FIELD = track;
|
|
entry.CDDB_FORMAT_FIELD = CDDB_MSF_FORMAT;
|
|
|
|
-#if defined(__OpenBSD__)
|
|
+#if defined(__OpenBSD__) || defined(__NetBSD__)
|
|
entry.data = &data;
|
|
entry.data_len = sizeof(data);
|
|
#endif
|
|
@@ -169,7 +169,7 @@ static PyObject *cdrom_leadout(PyObject
|
|
PyObject *cdrom_fileobj;
|
|
int cdrom_fd;
|
|
|
|
-#if defined(__OpenBSD__)
|
|
+#if defined(__OpenBSD__) || defined(__NetBSD__)
|
|
struct cd_toc_entry data;
|
|
#endif
|
|
|
|
@@ -181,7 +181,7 @@ static PyObject *cdrom_leadout(PyObject
|
|
entry.CDDB_TRACK_FIELD = CDDB_CDROM_LEADOUT;
|
|
entry.CDDB_FORMAT_FIELD = CDDB_MSF_FORMAT;
|
|
|
|
-#if defined(__OpenBSD__)
|
|
+#if defined(__OpenBSD__) || defined(__NetBSD__)
|
|
entry.data = &data;
|
|
entry.data_len = sizeof(data);
|
|
#endif
|
|
@@ -206,7 +206,7 @@ static PyObject *cdrom_really_close(PyOb
|
|
PyObject *cdrom_fileobj;
|
|
int cdrom_fd;
|
|
|
|
-#if defined(__OpenBSD__)
|
|
+#if defined(__OpenBSD__) || defined(__NetBSD__)
|
|
struct cd_toc_entry data;
|
|
#endif
|
|
|