libbluray | branch: master | hpi1 <[email protected]> | Mon Mar 19 09:54:47 2012 +0200| [d4c9814d20c5121e567a07840d3423b0f6f2d4b0] | committer: hpi1
Added configure check for mntent.h > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=d4c9814d20c5121e567a07840d3423b0f6f2d4b0 --- configure.ac | 2 +- src/libbluray/bluray.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 6005949..af31129 100644 --- a/configure.ac +++ b/configure.ac @@ -115,7 +115,7 @@ AC_TYPE_SIGNAL # required headers AC_CHECK_HEADERS([stdarg.h sys/types.h dirent.h errno.h libgen.h malloc.h]) AC_CHECK_HEADERS([stdlib.h mntent.h linux/cdrom.h inttypes.h strings.h]) -AC_CHECK_HEADERS([sys/time.h time.h]) +AC_CHECK_HEADERS([sys/time.h time.h mntent.h]) if test "${SYS}" != "mingw32" ; then AC_CHECK_HEADERS(pthread.h,, [AC_MSG_ERROR([pthread.h required])]) fi diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c index f8c1f0b..d2138d4 100644 --- a/src/libbluray/bluray.c +++ b/src/libbluray/bluray.c @@ -47,7 +47,7 @@ #include <inttypes.h> #include <string.h> -#ifdef __linux__ +#ifdef HAVE_MNTENT_H #include <sys/stat.h> #include <mntent.h> #endif @@ -912,7 +912,7 @@ static void _fill_disc_info(BLURAY *bd) } } -#ifdef __linux__ +#ifdef HAVE_MNTENT_H /* * Replace device node (/dev/sr0) by mount point * Implemented on Linux only at the moment, could be added for other OS @@ -967,7 +967,7 @@ BLURAY *bd_open(const char* device_path, const char* keyfile_path) bd->device_path = strdup(device_path); -#ifdef __linux__ +#ifdef HAVE_MNTENT_H get_mount_point(bd); #endif _______________________________________________ libbluray-devel mailing list [email protected] http://mailman.videolan.org/listinfo/libbluray-devel
