mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More HAVE_TERMIOS_H removals

This commit is contained in:
Enrico Weigelt, metux IT service 2010-01-02 10:00:26 +01:00
parent 4a4fc37f53
commit 86c345cd4b
5 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cons.saver.c
View File

@ -57,9 +57,7 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <fcntl.h>
#ifdef HAVE_TERMIOS_H
#include <termios.h>
#endif
#include <unistd.h>
#define LINUX_CONS_SAVER_C

2
src/layout.c
View File

@ -41,9 +41,7 @@
#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
#endif
#ifdef HAVE_TERMIOS_H
#include <termios.h>
#endif
#include <unistd.h>
#include "global.h"

2
src/tty/key.c
View File

@ -63,7 +63,7 @@
#ifdef __linux__
#if defined(__GLIBC__) && (__GLIBC__ < 2)
# include <linux/termios.h> /* TIOCLINUX */
#elif defined HAVE_TERMIOS_H
#else
# include <termios.h>
#endif
#include <sys/ioctl.h>

4
vfs/samba/configure.ac
View File

@ -46,8 +46,8 @@ AC_CHECK_HEADERS(unistd.h utime.h sys/id.h limits.h memory.h net/if.h)
AC_CHECK_HEADERS(compat.h rpc/rpc.h rpcsvc/nis.h rpcsvc/yp_prot.h rpcsvc/ypclnt.h)
AC_CHECK_HEADERS(sys/param.h ctype.h sys/resource.h sys/ioctl.h sys/mode.h)
AC_CHECK_HEADERS(sys/mman.h sys/filio.h sys/priv.h string.h strings.h sys/socket.h)
AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h)
AC_CHECK_HEADERS(sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h sys/sockio.h)
AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h)
AC_CHECK_HEADERS(sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h sys/sockio.h)
AC_CHECK_HEADERS(netinet/tcp.h netinet/in_systm.h netinet/in_ip.h)
AC_CHECK_HEADERS(sys/security.h security/pam_appl.h)
AC_CHECK_HEADERS(stropts.h poll.h syscall.h sys/syscall.h)

13
vfs/samba/include/includes.h
View File

@ -40,11 +40,6 @@
#define DEFAULT_PRINTING PRINT_QNX
#endif
#ifdef SUNOS4
/* on SUNOS4 termios.h conflicts with sys/ioctl.h */
#undef HAVE_TERMIOS_H
#endif
#include <sys/types.h>
#include <fcntl.h>
#include <sys/stat.h>
@ -173,16 +168,8 @@
#include <netinet/ip.h>
#endif
#if defined(HAVE_TERMIOS_H)
/* POSIX terminal handling. */
#include <termios.h>
#elif defined(HAVE_TERMIO_H)
/* Older SYSV terminal handling - don't use if we can avoid it. */
#include <termio.h>
#elif defined(HAVE_SYS_TERMIO_H)
/* Older SYSV terminal handling - don't use if we can avoid it. */
#include <sys/termio.h>
#endif
# include <dirent.h>