Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-10-22 07:21:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix compilation on Solaris: ioctl requires more headers

Browse Source
This commit is contained in:
Moritz Bunkus 2014-02-03 21:23:54 +01:00
parent 8f6db59305
commit d3cf4f5756
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ac/initialization.m4
View File

@ -17,5 +17,5 @@ PKG_PROG_PKG_CONFIG
dnl Check for headers
AC_HEADER_STDC()
AC_CHECK_HEADERS([inttypes.h stdint.h sys/types.h sys/syscall.h])
AC_CHECK_HEADERS([inttypes.h stdint.h sys/types.h sys/syscall.h stropts.h])
AC_CHECK_FUNCS([vsscanf syscall],,)

7
src/common/terminal.cpp
View File

@ -18,6 +18,12 @@
# if defined(HAVE_SYS_IOCTL_H) || defined(GWINSZ_IN_SYS_IOCTL)
# include <sys/ioctl.h>
# endif // HAVE_SYS_IOCTL_H || GWINSZ_IN_SYS_IOCTL
# if defined(HAVE_UNISTD_H)
# include <unistd.h>
# endif // HAVE_UNISTD_H
# if defined(HAVE_STROPTS_H)
# include <stropts.h>
# endif // HAVE_STROPTS_H
#endif // HAVE_TIOCGWINSZ
#include "common/terminal.h"
@ -37,4 +43,3 @@ get_terminal_columns() {
return DEFAULT_TERMINAL_COLUMNS;
#endif // HAVE_TIOCGWINSZ
}