diff options
| author | Nathan Keynes <Nathan.Keynes@Sun.COM> | 2009-04-30 16:35:44 -0700 |
|---|---|---|
| committer | Nathan Keynes <Nathan.Keynes@Sun.COM> | 2009-04-30 16:35:44 -0700 |
| commit | 8883f1c270cc8e33c18dd088e744840092b47bbb (patch) | |
| tree | 8158374df4c6ad96b23aae3de2c235943f3dcc7a /usr/src/ucblib | |
| parent | 2d2627043e43d2539979aab3fb55dafd776970e6 (diff) | |
| download | illumos-joyent-8883f1c270cc8e33c18dd088e744840092b47bbb.tar.gz | |
6795209 Enable compilation of ON-consolidation with GCC 4.2
6392640 rpcgen -h -T output does not compile with gcc 4.x
Diffstat (limited to 'usr/src/ucblib')
| -rw-r--r-- | usr/src/ucblib/libucb/i386/sys/signal.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/usr/src/ucblib/libucb/i386/sys/signal.c b/usr/src/ucblib/libucb/i386/sys/signal.c index 2afb74cd34..0e9001704b 100644 --- a/usr/src/ucblib/libucb/i386/sys/signal.c +++ b/usr/src/ucblib/libucb/i386/sys/signal.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -43,8 +42,6 @@ * mask |= sigmask(i) */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <ucontext.h> #include <signal.h> @@ -84,10 +81,10 @@ int ucbsiginterrupt(int, int); * and then calls the real handler */ +static void ucbsigvechandler(); void _sigvechandler(int sig, siginfo_t *sip, ucontext_t *ucp) { - static void ucbsigvechandler(); ucbsigvechandler(sig, sip, ucp); } @@ -376,7 +373,7 @@ ucbsignal(int s, void (*a)()))() if (nsv.sv_mask != osv.sv_mask || nsv.sv_flags != osv.sv_flags) { mask[s] = nsv.sv_mask = osv.sv_mask; flags[s] = nsv.sv_flags = - osv.sv_flags & ~(SV_RESETHAND|SV_INTERRUPT); + osv.sv_flags & ~(SV_RESETHAND|SV_INTERRUPT); if (ucbsigvec(s, &nsv, (struct sigvec *)0) < 0) return (SIG_ERR); } |