backout 5876 sys/regset.h pollutes name space

backout commit 21227944c2bcc086121a5428f3f9d2496ba646f5.

9 files changed, 15 insertions, 9 deletions

diff --git a/usr/src/lib/libc/amd64/gen/makectxt.c b/usr/src/lib/libc/amd64/gen/makectxt.c
index c8fd3c7742..5b2ce15313 100644
--- a/usr/src/lib/libc/amd64/gen/makectxt.c
+++ b/usr/src/lib/libc/amd64/gen/makectxt.c
@@ -27,13 +27,14 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 #pragma weak _makecontext = makecontext
 
 #include "lint.h"
 #include <stdarg.h>
 #include <ucontext.h>
 #include <sys/stack.h>
-#include <sys/regset.h>
 
 /*
  * The ucontext_t that the user passes in must have been primed with a
diff --git a/usr/src/lib/libc/amd64/gen/siglongjmp.c b/usr/src/lib/libc/amd64/gen/siglongjmp.c
index 6637c19625..07a89b485f 100644
--- a/usr/src/lib/libc/amd64/gen/siglongjmp.c
+++ b/usr/src/lib/libc/amd64/gen/siglongjmp.c
@@ -24,12 +24,13 @@
  * Use is subject to license terms.
  */
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 #pragma weak _siglongjmp = siglongjmp
 
 #include "lint.h"
 #include <sys/types.h>
 #include <sys/ucontext.h>
-#include <sys/regset.h>
 #include <setjmp.h>
 #include <ucontext.h>
 
diff --git a/usr/src/lib/libc/i386/gen/makectxt.c b/usr/src/lib/libc/i386/gen/makectxt.c
index 1e6f995d84..d72a67a481 100644
--- a/usr/src/lib/libc/i386/gen/makectxt.c
+++ b/usr/src/lib/libc/i386/gen/makectxt.c
@@ -27,12 +27,13 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 #pragma weak _makecontext = makecontext
 
 #include "lint.h"
 #include <stdarg.h>
 #include <ucontext.h>
-#include <sys/regset.h>
 #include <sys/stack.h>
 
 /*
diff --git a/usr/src/lib/libc/i386/gen/siglongjmp.c b/usr/src/lib/libc/i386/gen/siglongjmp.c
index 17261b3efd..ea23fcf749 100644
--- a/usr/src/lib/libc/i386/gen/siglongjmp.c
+++ b/usr/src/lib/libc/i386/gen/siglongjmp.c
@@ -28,12 +28,13 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 #pragma weak _siglongjmp = siglongjmp
 
 #include "lint.h"
 #include <sys/types.h>
 #include <sys/ucontext.h>
-#include <sys/regset.h>
 #include <setjmp.h>
 #include <ucontext.h>
 
diff --git a/usr/src/lib/libc/port/threads/sigaction.c b/usr/src/lib/libc/port/threads/sigaction.c
index 571e211f97..8e9df7ab60 100644
--- a/usr/src/lib/libc/port/threads/sigaction.c
+++ b/usr/src/lib/libc/port/threads/sigaction.c
@@ -208,7 +208,7 @@ call_user_handler(int sig, siginfo_t *sip, ucontext_t *ucp)
 
 		if (--fp->fpu_qcnt > 0) {
 			unsigned char i;
-			struct _fq *fqp;
+			struct fq *fqp;
 
 			fqp = fp->fpu_q;
 			for (i = 0; i < fp->fpu_qcnt; i++)
diff --git a/usr/src/lib/libc/sparc/gen/makectxt.c b/usr/src/lib/libc/sparc/gen/makectxt.c
index fa5725525e..7519bdabcb 100644
--- a/usr/src/lib/libc/sparc/gen/makectxt.c
+++ b/usr/src/lib/libc/sparc/gen/makectxt.c
@@ -27,6 +27,8 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 #pragma weak _makecontext = makecontext
 #pragma weak ___makecontext_v2 = __makecontext_v2
 
@@ -36,7 +38,6 @@
 #include <sys/ucontext.h>
 #include <sys/stack.h>
 #include <sys/frame.h>
-#include <sys/regset.h>
 
 /*
  * The ucontext_t that the user passes in must have been primed with a
diff --git a/usr/src/lib/libc/sparc/gen/siglongjmp.c b/usr/src/lib/libc/sparc/gen/siglongjmp.c
index 90b406cf8d..83a640397d 100644
--- a/usr/src/lib/libc/sparc/gen/siglongjmp.c
+++ b/usr/src/lib/libc/sparc/gen/siglongjmp.c
@@ -27,13 +27,14 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 #pragma weak _siglongjmp = siglongjmp
 
 #include "lint.h"
 #include <sys/types.h>
 #include <sys/stack.h>
 #include <sys/frame.h>
-#include <sys/regset.h>
 #include <memory.h>
 #include <ucontext.h>
 #include <setjmp.h>
diff --git a/usr/src/lib/libc/sparcv9/gen/makectxt.c b/usr/src/lib/libc/sparcv9/gen/makectxt.c
index fa5725525e..7519bdabcb 100644
--- a/usr/src/lib/libc/sparcv9/gen/makectxt.c
+++ b/usr/src/lib/libc/sparcv9/gen/makectxt.c
@@ -27,6 +27,8 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
 #pragma weak _makecontext = makecontext
 #pragma weak ___makecontext_v2 = __makecontext_v2
 
@@ -36,7 +38,6 @@
 #include <sys/ucontext.h>
 #include <sys/stack.h>
 #include <sys/frame.h>
-#include <sys/regset.h>
 
 /*
  * The ucontext_t that the user passes in must have been primed with a
diff --git a/usr/src/lib/libc/sparcv9/gen/siglongjmp.c b/usr/src/lib/libc/sparcv9/gen/siglongjmp.c
index 424942966f..5d4ca06426 100644
--- a/usr/src/lib/libc/sparcv9/gen/siglongjmp.c
+++ b/usr/src/lib/libc/sparcv9/gen/siglongjmp.c
@@ -32,7 +32,6 @@
 #include <sys/types.h>
 #include <sys/stack.h>
 #include <sys/frame.h>
-#include <sys/regset.h>
 #include <memory.h>
 #include <ucontext.h>
 #include <setjmp.h>