From bc0e91320069f0bcaee43e80a7ea686d9efa2d08 Mon Sep 17 00:00:00 2001 From: Gordon Ross Date: Sat, 2 May 2015 16:01:22 -0400 Subject: 5876 sys/regset.h pollutes name space (try 2) Reviewed by: Josef 'Jeff' Sipek Reviewed by: Jonathan Perkin Reviewed by: Alexander Pyhalov Reviewed by: Garrett D'Amore Approved by: Dan McDonald --- usr/src/lib/libc/port/threads/sigaction.c | 2 +- usr/src/lib/libc/sparc/gen/makectxt.c | 4 ++-- usr/src/lib/libc/sparcv9/gen/makectxt.c | 4 ++-- usr/src/lib/libproc/common/P32ton.c | 6 ++---- 4 files changed, 7 insertions(+), 9 deletions(-) (limited to 'usr/src/lib') diff --git a/usr/src/lib/libc/port/threads/sigaction.c b/usr/src/lib/libc/port/threads/sigaction.c index 8e9df7ab60..571e211f97 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 7519bdabcb..497c642516 100644 --- a/usr/src/lib/libc/sparc/gen/makectxt.c +++ b/usr/src/lib/libc/sparc/gen/makectxt.c @@ -27,15 +27,15 @@ /* 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 #include "lint.h" #include #include +/* Can't just use due to redefine_extname stuff. */ #include +#include #include #include diff --git a/usr/src/lib/libc/sparcv9/gen/makectxt.c b/usr/src/lib/libc/sparcv9/gen/makectxt.c index 7519bdabcb..497c642516 100644 --- a/usr/src/lib/libc/sparcv9/gen/makectxt.c +++ b/usr/src/lib/libc/sparcv9/gen/makectxt.c @@ -27,15 +27,15 @@ /* 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 #include "lint.h" #include #include +/* Can't just use due to redefine_extname stuff. */ #include +#include #include #include diff --git a/usr/src/lib/libproc/common/P32ton.c b/usr/src/lib/libproc/common/P32ton.c index 78219550c8..acb52058c9 100644 --- a/usr/src/lib/libproc/common/P32ton.c +++ b/usr/src/lib/libproc/common/P32ton.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include #include #include @@ -267,7 +265,7 @@ prfpregset_32_to_n(const prfpregset32_t *src, prfpregset_t *dst) #elif defined(__amd64) struct _fpstate32 *src32 = (struct _fpstate32 *)src; - struct fpchip_state *dst64 = (struct fpchip_state *)dst; + struct _fpchip_state *dst64 = (struct _fpchip_state *)dst; int i; (void) memcpy(dst64->st, src32->_st, sizeof (src32->_st)); @@ -598,7 +596,7 @@ prfpregset_n_to_32(const prfpregset_t *src, prfpregset32_t *dst) #elif defined(__amd64) struct _fpstate32 *dst32 = (struct _fpstate32 *)dst; - struct fpchip_state *src64 = (struct fpchip_state *)src; + struct _fpchip_state *src64 = (struct _fpchip_state *)src; uint32_t top; int i; -- cgit v1.2.3