claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove a GNU/Linux includes that isn't used any more.

Browse Source 
Move other GNU/Linux tests to the linux-specific part of configure.
This commit is contained in:
rocky
2005-01-07 22:15:24 +00:00
parent 23b8fedd65
commit b080079248
3 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@@ -19,7 +19,7 @@ define(RELEASE_NUM, 72)
define(CDIO_VERSION_STR, 0.$1cvs) define(CDIO_VERSION_STR, 0.$1cvs)
AC_PREREQ(2.52) AC_PREREQ(2.52)
AC_REVISION([$Id: configure.ac,v 1.124 2005/01/06 11:39:40 rocky Exp $])dnl AC_REVISION([$Id: configure.ac,v 1.125 2005/01/07 22:15:24 rocky Exp $])dnl
AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM)) AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
AC_CONFIG_SRCDIR(src/cd-info.c) AC_CONFIG_SRCDIR(src/cd-info.c)
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
@@ -147,8 +147,6 @@ dnl headers
AC_HEADER_STDC AC_HEADER_STDC
AC_CHECK_HEADERS(errno.h fcntl.h glob.h) AC_CHECK_HEADERS(errno.h fcntl.h glob.h)
AC_CHECK_HEADERS(stdarg.h stdbool.h stdio.h sys/cdio.h) AC_CHECK_HEADERS(stdarg.h stdbool.h stdio.h sys/cdio.h)
AC_CHECK_HEADERS(linux/sbpcd.h, SBPCD_H="-DSBPCD_H='1' ")
AC_CHECK_HEADERS(linux/ucdrom.h, UCDROM_H="-DUCDROM_H='1' ")
AC_SUBST(SBPCD_H) AC_SUBST(SBPCD_H)
AC_SUBST(UCDROM_H) AC_SUBST(UCDROM_H)
@@ -333,7 +331,7 @@ case $host_os in
fi fi
;; ;;
linux*) linux*)
AC_CHECK_HEADERS(linux/version.h linux_major.h) AC_CHECK_HEADERS(linux/version.h)
AC_CHECK_HEADERS(linux/cdrom.h, [have_linux_cdrom_h="yes"]) AC_CHECK_HEADERS(linux/cdrom.h, [have_linux_cdrom_h="yes"])
if test "x$have_linux_cdrom_h" = "xyes" ; then if test "x$have_linux_cdrom_h" = "xyes" ; then
AC_TRY_COMPILE(,[ AC_TRY_COMPILE(,[

14
lib/cdda_interface/low_interface.h
View File

@@ -1,5 +1,5 @@
/* /*
$Id: low_interface.h,v 1.4 2005/01/06 03:09:11 rocky Exp $ $Id: low_interface.h,v 1.5 2005/01/07 22:15:25 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1998 Monty xiphmont@mit.edu Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -38,10 +38,6 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
#ifdef HAVE_LINUX_MAJOR_H
#include <linux/major.h>
#endif
#ifdef HAVE_LINUX_VERSION_H #ifdef HAVE_LINUX_VERSION_H
#include <linux/version.h> #include <linux/version.h>
#endif #endif
@@ -51,14 +47,6 @@
/* some include file locations have changed with newer kernels */ /* some include file locations have changed with newer kernels */
#ifdef SBPCD_H
#include <linux/sbpcd.h>
#endif
#ifdef UCDROM_H
#include <linux/ucdrom.h>
#endif
#ifndef CDROMAUDIOBUFSIZ #ifndef CDROMAUDIOBUFSIZ
#define CDROMAUDIOBUFSIZ 0x5382 /* set the audio buffer size */ #define CDROMAUDIOBUFSIZ 0x5382 /* set the audio buffer size */
#endif #endif

3
src/cd-paranoia/cd-paranoia.c
View File

@@ -708,9 +708,6 @@ cleanup (void)
{ {
if (p) paranoia_free(p); if (p) paranoia_free(p);
if (d) cdda_close(d); if (d) cdda_close(d);
#if FIXME_FIGURE_THIS_OUT
free_and_null(span);
#endif
free_and_null(force_cdrom_device); free_and_null(force_cdrom_device);
free_and_null(force_generic_device); free_and_null(force_generic_device);
} }