changeset 419:2291caab50ca trunk

[svn] FreeBSD 6.x/7.x newata cdrio fixes. (I now have an ia32 box to work with ;))
author nenolod
date Thu, 12 Jan 2006 18:27:22 -0800
parents f03932d43230
children 44c513ae3527
files Plugins/Input/cdaudio/cdaudio.c Plugins/Input/cdaudio/cdaudio.h
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Plugins/Input/cdaudio/cdaudio.c	Wed Jan 11 06:11:10 2006 -0800
+++ b/Plugins/Input/cdaudio/cdaudio.c	Thu Jan 12 18:27:22 2006 -0800
@@ -617,7 +617,7 @@
 #elif defined(HAVE_GETMNTINFO)
     entries = getmntinfo(&fsp, MNT_NOWAIT);
     if (entries < 0)
-        return NULL;
+        return FALSE;
 
     while (entries-- > 0) {
         if (!strcmp(fsp->f_mntfromname, devname))
--- a/Plugins/Input/cdaudio/cdaudio.h	Wed Jan 11 06:11:10 2006 -0800
+++ b/Plugins/Input/cdaudio/cdaudio.h	Thu Jan 12 18:27:22 2006 -0800
@@ -54,6 +54,7 @@
 #include <linux/cdrom.h>
 #elif defined HAVE_SYS_CDIO_H
 #include <sys/cdio.h>
+#include <sys/cdrio.h>
 #endif
 
 #if defined(CDROMREADAUDIO) || defined(CDIOCREADAUDIO) || defined(CDROMCDDA) || defined(CDRIOCSETBLOCKSIZE)