Mercurial > audlegacy
changeset 1675:cc5952675fca trunk
[svn] Fixes for NetBSD by Jonathan Schleifer <js@h3c.de>
| author | chainsaw |
|---|---|
| date | Wed, 13 Sep 2006 06:38:40 -0700 |
| parents | 62ee0900bb9a |
| children | cf006d682cbe |
| files | ChangeLog Plugins/Container/xspf/xspf.c Plugins/Input/cdaudio/cdaudio.c Plugins/Input/cdaudio/cdaudio.h configure.ac |
| diffstat | 5 files changed, 20 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Sep 13 05:22:45 2006 -0700 +++ b/ChangeLog Wed Sep 13 06:38:40 2006 -0700 @@ -1,3 +1,11 @@ +2006-09-13 12:22:45 +0000 Tony Vroon <chainsaw@gentoo.org> + revision [2285] + Remove unused bmp_player.xpm; as requested by Mikachu on #audacious. + + Changes: Modified: + +0 -97 trunk/audacious/images/bmp_player.xpm + + 2006-09-13 06:31:24 +0000 William Pitcock <nenolod@nenolod.net> revision [2283] - new DND handler
--- a/Plugins/Container/xspf/xspf.c Wed Sep 13 05:22:45 2006 -0700 +++ b/Plugins/Container/xspf/xspf.c Wed Sep 13 06:38:40 2006 -0700 @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include <config.h> + #include <glib.h> #include <string.h> #include <glib.h>
--- a/Plugins/Input/cdaudio/cdaudio.c Wed Sep 13 05:22:45 2006 -0700 +++ b/Plugins/Input/cdaudio/cdaudio.c Wed Sep 13 06:38:40 2006 -0700 @@ -76,7 +76,7 @@ # define CDDA_DEVICE "/dev/acd0c" # elif defined __FreeBSD__ # define CDDA_DEVICE "/dev/acd0" -# elif defined __OpenBSD__ +# elif defined __OpenBSD__ || defined __NetBSD__ # define CDDA_DEVICE "/dev/cd0c" # else # define CDDA_DEVICE "/vol/dev/aliases/cdrom0" @@ -90,7 +90,7 @@ # ifdef HAVE_SYS_CDIO_H # ifdef __FreeBSD__ # define CDDA_DIRECTORY "/cdrom" -# elif defined __OpenBSD__ +# elif defined __OpenBSD__ || defined __NetBSD__ # define CDDA_DIRECTORY "/cdrom" # else # define CDDA_DIRECTORY "/cdrom/cdrom0" @@ -595,7 +595,11 @@ FILE *mounts; struct mntent *mnt; #elif defined(HAVE_GETMNTINFO) +#if defined __NetBSD__ && HAVE_STATVFS + struct statvfs *fsp; +#else struct statfs *fsp; +#endif int entries; #endif
--- a/Plugins/Input/cdaudio/cdaudio.h Wed Sep 13 05:22:45 2006 -0700 +++ b/Plugins/Input/cdaudio/cdaudio.h Wed Sep 13 06:38:40 2006 -0700 @@ -54,8 +54,10 @@ #include <linux/cdrom.h> #elif defined HAVE_SYS_CDIO_H #include <sys/cdio.h> +#ifdef HAVE_SYS_CDRIO_H #include <sys/cdrio.h> #endif +#endif #if defined(CDROMREADAUDIO) || defined(CDIOCREADAUDIO) || defined(CDROMCDDA) || defined(CDRIOCSETBLOCKSIZE) # define CDDA_HAS_READAUDIO
--- a/configure.ac Wed Sep 13 05:22:45 2006 -0700 +++ b/configure.ac Wed Sep 13 06:38:40 2006 -0700 @@ -845,6 +845,7 @@ AC_CHECK_HEADERS(linux/cdrom.h) AC_CHECK_HEADERS(sys/cdio.h) +AC_CHECK_HEADERS(sys/cdrio.h) AC_CHECK_HEADERS(linux/joystick.h) AC_CHECK_HEADERS(unistd.h) AC_CHECK_HEADERS(fcntl.h) @@ -854,7 +855,7 @@ AC_CHECK_HEADERS(wchar.h) AC_CHECK_HEADERS(fts.h) -AC_CHECK_FUNCS([mkdtemp getmntinfo strtoul lrintf]) +AC_CHECK_FUNCS([mkdtemp getmntinfo statvfs strtoul lrintf]) if test "${ac_cv_header_linux_cdrom_h}" = "yes" || test "${ac_cv_header_sys_cdio_h}" = "yes"