From a20e740c7dccd260a40cb8f0de116e05dabbf24d Mon Sep 17 00:00:00 2001
From: sef <sef@FreeBSD.org>
Date: Fri, 9 Jan 1998 09:31:42 +0000
Subject: Revert the changes yet again, after some email from Bruce.  Sorry.

---
 usr.bin/truss/Makefile        | 2 +-
 usr.bin/truss/amd64-fbsd32.c  | 6 +++---
 usr.bin/truss/amd64-linux32.c | 6 +++---
 usr.bin/truss/i386-fbsd.c     | 6 +++---
 usr.bin/truss/i386-linux.c    | 6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'usr.bin/truss')

diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile
index 61d7842..63172a8 100644
--- a/usr.bin/truss/Makefile
+++ b/usr.bin/truss/Makefile
@@ -1,7 +1,7 @@
 PROG=	truss
 SRCS=	main.c setup.c i386-fbsd.c i386-linux.c \
 	syscalls.c linux_syscalls.h syscalls.h ioctl.c
-CFLAGS+= -I${.CURDIR} -I. -I${.CUDIR}/../../sys
+CFLAGS+= -I${.CURDIR} -I.
 CLEANFILES+=i386l-syscalls.master syscalls.master linux_syscalls.h \
 	syscalls.h ioctl.c
 
diff --git a/usr.bin/truss/amd64-fbsd32.c b/usr.bin/truss/amd64-fbsd32.c
index 1686e58..2a88655 100644
--- a/usr.bin/truss/amd64-fbsd32.c
+++ b/usr.bin/truss/amd64-fbsd32.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: i386-fbsd.c,v 1.3 1998/01/05 07:30:24 charnier Exp $";
+	"$Id: i386-fbsd.c,v 1.4 1998/01/09 00:39:07 sef Exp $";
 #endif /* not lint */
 
 /*
@@ -51,8 +51,8 @@ static const char rcsid[] =
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/pioctl.h>
-#include <i386/include/reg.h>
-#include <i386/include/psl.h>
+#include <machine/reg.h>
+#include <machine/psl.h>
 #include <sys/syscall.h>
 
 #include "syscall.h"
diff --git a/usr.bin/truss/amd64-linux32.c b/usr.bin/truss/amd64-linux32.c
index 4a2421e..8052f1c 100644
--- a/usr.bin/truss/amd64-linux32.c
+++ b/usr.bin/truss/amd64-linux32.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: i386-linux.c,v 1.3 1998/01/05 07:30:25 charnier Exp $";
+	"$Id: i386-linux.c,v 1.4 1998/01/09 00:39:10 sef Exp $";
 #endif /* not lint */
 
 /*
@@ -49,8 +49,8 @@ static const char rcsid[] =
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/pioctl.h>
-#include <i386/include/reg.h>
-#include <i386/include/psl.h>
+#include <machine/reg.h>
+#include <machine/psl.h>
 
 #include "syscall.h"
 
diff --git a/usr.bin/truss/i386-fbsd.c b/usr.bin/truss/i386-fbsd.c
index 1686e58..2a88655 100644
--- a/usr.bin/truss/i386-fbsd.c
+++ b/usr.bin/truss/i386-fbsd.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: i386-fbsd.c,v 1.3 1998/01/05 07:30:24 charnier Exp $";
+	"$Id: i386-fbsd.c,v 1.4 1998/01/09 00:39:07 sef Exp $";
 #endif /* not lint */
 
 /*
@@ -51,8 +51,8 @@ static const char rcsid[] =
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/pioctl.h>
-#include <i386/include/reg.h>
-#include <i386/include/psl.h>
+#include <machine/reg.h>
+#include <machine/psl.h>
 #include <sys/syscall.h>
 
 #include "syscall.h"
diff --git a/usr.bin/truss/i386-linux.c b/usr.bin/truss/i386-linux.c
index 4a2421e..8052f1c 100644
--- a/usr.bin/truss/i386-linux.c
+++ b/usr.bin/truss/i386-linux.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: i386-linux.c,v 1.3 1998/01/05 07:30:25 charnier Exp $";
+	"$Id: i386-linux.c,v 1.4 1998/01/09 00:39:10 sef Exp $";
 #endif /* not lint */
 
 /*
@@ -49,8 +49,8 @@ static const char rcsid[] =
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/pioctl.h>
-#include <i386/include/reg.h>
-#include <i386/include/psl.h>
+#include <machine/reg.h>
+#include <machine/psl.h>
 
 #include "syscall.h"
 
-- 
cgit v1.1