From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Sat, 25 Feb 2012 01:54:34 +0000 (+0100)
Subject: Build fixes after non-Linux code removal
X-Git-Tag: v4.7~154
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a3cf10c3095a9f80138b83f3d54499b825c9797;p=strace

Build fixes after non-Linux code removal

* configure.ac: Remove calls to proc-based ptrace checks.
* proc.c: Remove, it's empty now.
* Makefile.am: Remove reference to proc.c.
* net.c: Remove trailing newlines.
* quota.c: Likewise
* resource.c: Likewise
* strace.c: Likewise
* stream.c: Likewise
* time.c: Likewise

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/Makefile.am b/Makefile.am
index 35058d78..d9c47954 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@ AM_CPPFLAGS = -I$(srcdir)/$(OS)/$(ARCH) -I$(srcdir)/$(OS) -I$(builddir)/$(OS)
 strace_SOURCES = strace.c syscall.c count.c util.c desc.c file.c ipc.c \
 		 io.c ioctl.c mem.c net.c process.c bjm.c quota.c \
 		 resource.c signal.c sock.c system.c term.c time.c \
-                proc.c scsi.c stream.c block.c pathtrace.c
+                scsi.c stream.c block.c pathtrace.c
 noinst_HEADERS = defs.h
 
 EXTRA_DIST = $(man_MANS) errnoent.sh signalent.sh syscallent.sh ioctlsort.c \
diff --git a/configure.ac b/configure.ac
index 882e8dd8..6eb9a03e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -259,11 +259,7 @@ AC_CHECK_TYPES([struct sigcontext_struct,
 		struct sigcontext],,, [#include <signal.h>])
 AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include <netinet/in.h>])
 
-AC_MP_PROCFS
-AC_POLLABLE_PROCFS
-
 AC_CHECK_MEMBERS([struct msghdr.msg_control],,, [#include <sys/socket.h>])
-AC_STRUCT_PR_SYSCALL
 
 AC_CHECK_MEMBERS([struct T_conn_res.QUEUE_ptr,
                   struct T_conn_res.ACCEPTOR_id],,,
diff --git a/net.c b/net.c
index 2aecc365..d5baf233 100644
--- a/net.c
+++ b/net.c
@@ -2185,4 +2185,3 @@ sys_setsockopt(struct tcb *tcp)
 	}
 	return 0;
 }
-
diff --git a/proc.c b/proc.c
deleted file mode 100644
index 06b3fcb9..00000000
--- a/proc.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$Id$
- */
-
-#include "defs.h"
-
-
diff --git a/quota.c b/quota.c
index 7e228ce0..86600e95 100644
--- a/quota.c
+++ b/quota.c
@@ -655,5 +655,3 @@ sys_quotactl(struct tcb *tcp)
 	}
 	return 0;
 }
-
-
diff --git a/resource.c b/resource.c
index 9040b052..4f20f1a5 100644
--- a/resource.c
+++ b/resource.c
@@ -464,4 +464,3 @@ sys_times(struct tcb *tcp)
 	}
 	return 0;
 }
-
diff --git a/strace.c b/strace.c
index 66dee5f8..ec3068aa 100644
--- a/strace.c
+++ b/strace.c
@@ -2119,4 +2119,3 @@ tabto(void)
 	if (curcol < acolumn)
 		tprints(acolumn_spaces + curcol);
 }
-
diff --git a/stream.c b/stream.c
index 3eb7dde5..d2b7454d 100644
--- a/stream.c
+++ b/stream.c
@@ -451,5 +451,3 @@ sys_poll(struct tcb *tcp)
 	return 0;
 }
 #endif
-
-
diff --git a/time.c b/time.c
index 4cc9c591..1a134aeb 100644
--- a/time.c
+++ b/time.c
@@ -962,4 +962,3 @@ sys_timerfd_gettime(struct tcb *tcp)
 	}
 	return 0;
 }
-