summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2012-02-24 23:57:26 +0000
committerDmitry V. Levin <ldv@altlinux.org>2012-02-25 00:03:17 +0000
commit6f006bb6ee62f635527f3fdc0f6d0b5069bdb859 (patch)
tree2f8f1140e86d7f99bb22470d08cc570c91fe4c32
parentd849ee253e39398e3b652c860de923f6d3836bed (diff)
downloadstrace-ldv/unifdef.tar.gz
Remove redundant codeldv/unifdef
* configure.ac: Remove AC_PROG_GCC_TRADITIONAL. (AC_CHECK_FUNCS): Remove getdents, mctl and pread). (AC_CHECK_HEADERS): Remove termio.h, sys/aio.h, sys/door.h, sys/nscsys.h, sys/stream.h, sys/sysconfig.h, sys/tihdr.h and sys/tiuser.h. * defs.h (stream_ioctl): Remove. * ioctl.c: Remove HAVE_SYS_STREAM_H block. * stream.c: Remove HAVE_SYS_STREAM_H, HAVE_SYS_TIHDR_H and HAVE_SYS_TIUSER_H blocks.
-rw-r--r--configure.ac12
-rw-r--r--defs.h1
-rw-r--r--ioctl.c4
-rw-r--r--stream.c12
4 files changed, 0 insertions, 29 deletions
diff --git a/configure.ac b/configure.ac
index ab09268f2..d1513ca8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,7 +119,6 @@ gl_WARN_ADD([-Wwrite-strings])
AC_SUBST([WARN_CFLAGS])
AC_PROG_CPP
-AC_PROG_GCC_TRADITIONAL
AC_PROG_INSTALL
AC_C_CONST
AC_C_BIGENDIAN
@@ -157,12 +156,9 @@ AC_CHECK_TYPES([struct t_opthdr],,, [#include <sys/tiuser.h>])
AC_CHECK_FUNCS([ \
fork \
- getdents \
if_indextoname \
inet_ntop \
- mctl \
prctl \
- pread \
sendmsg \
sigaction \
strerror \
@@ -179,23 +175,15 @@ AC_CHECK_HEADERS([ \
mqueue.h \
poll.h \
stropts.h \
- termio.h \
sys/acl.h \
- sys/aio.h \
sys/asynch.h \
sys/conf.h \
- sys/door.h \
sys/epoll.h \
sys/filio.h \
sys/ioctl.h \
- sys/nscsys.h \
sys/poll.h \
sys/ptrace.h \
sys/reg.h \
- sys/stream.h \
- sys/sysconfig.h \
- sys/tihdr.h \
- sys/tiuser.h \
sys/uio.h \
sys/vfs.h \
asm/cachectl.h \
diff --git a/defs.h b/defs.h
index 5fb46e136..e74d4a2d9 100644
--- a/defs.h
+++ b/defs.h
@@ -545,7 +545,6 @@ extern int ioctl_decode(struct tcb *, long, long);
extern int term_ioctl(struct tcb *, long, long);
extern int sock_ioctl(struct tcb *, long, long);
extern int proc_ioctl(struct tcb *, int, int);
-extern int stream_ioctl(struct tcb *, int, int);
extern int rtc_ioctl(struct tcb *, long, long);
extern int scsi_ioctl(struct tcb *, long, long);
extern int block_ioctl(struct tcb *, long, long);
diff --git a/ioctl.c b/ioctl.c
index 5bec5e758..0ea6b2e52 100644
--- a/ioctl.c
+++ b/ioctl.c
@@ -82,10 +82,6 @@ ioctl_decode(struct tcb *tcp, long code, long arg)
return term_ioctl(tcp, code, arg);
case 0x89:
return sock_ioctl(tcp, code, arg);
-#ifdef HAVE_SYS_STREAM_H
- case 'S':
- return stream_ioctl(tcp, code, arg);
-#endif /* HAVE_SYS_STREAM_H */
case 'p':
return rtc_ioctl(tcp, code, arg);
case 0x03:
diff --git a/stream.c b/stream.c
index 338670944..896f99ee3 100644
--- a/stream.c
+++ b/stream.c
@@ -43,12 +43,6 @@
#ifdef HAVE_SYS_CONF_H
#include <sys/conf.h>
#endif
-#ifdef HAVE_SYS_STREAM_H
-#include <sys/stream.h>
-#endif
-#ifdef HAVE_SYS_TIHDR_H
-#include <sys/tihdr.h>
-#endif
#ifndef HAVE_STROPTS_H
#define RS_HIPRI 1
@@ -61,12 +55,6 @@ struct strbuf {
#define MOREDATA 2
#endif /* !HAVE_STROPTS_H */
-#ifdef HAVE_SYS_TIUSER_H
-#include <sys/tiuser.h>
-#include <sys/sockmod.h>
-#include <sys/timod.h>
-#endif /* HAVE_SYS_TIUSER_H */
-
static const struct xlat msgflags[] = {
{ RS_HIPRI, "RS_HIPRI" },
{ 0, NULL },