diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-12-08 13:03:18 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-12-08 13:03:18 +0000 |
| commit | ca8beeb64ffb099a0fa69ec946e7d1c284b1fc3f (patch) | |
| tree | c58ab28cfca7039cafd5516e46d12332675fa0fa /usr/src/lib/libproc/common | |
| parent | 2ab4f0b80dd6c4db6c4dc192af969103074015b6 (diff) | |
| parent | bc0e91320069f0bcaee43e80a7ea686d9efa2d08 (diff) | |
| download | illumos-joyent-ca8beeb64ffb099a0fa69ec946e7d1c284b1fc3f.tar.gz | |
[illumos-gate merge]
commit bc0e91320069f0bcaee43e80a7ea686d9efa2d08
5876 sys/regset.h pollutes name space (try 2)
commit 5878fad70d76d8711f6608c1f80b0447601261c6
4986 receiving replication stream fails if any snapshot exceeds refquota
Diffstat (limited to 'usr/src/lib/libproc/common')
| -rw-r--r-- | usr/src/lib/libproc/common/P32ton.c | 6 |
1 files changed, 2 insertions, 4 deletions
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 <sys/types.h> #include <sys/mkdev.h> #include <sys/regset.h> @@ -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; |