diff options
| author | David Leadbeater <dgl@dgl.cx> | 2012-08-18 16:44:32 +0100 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2013-09-10 13:45:27 +0200 |
| commit | 21e89b5f7274f876bff09798ebcc556906fb70d6 (patch) | |
| tree | eedcdd346b25d2254826e395d5b44b2e8b80f8c0 /pp_sys.c | |
| parent | 57b2427a3baa2694768d34123e2e814ddd9a39ac (diff) | |
| download | perl-21e89b5f7274f876bff09798ebcc556906fb70d6.tar.gz | |
Remove PERL_MICRO where it is conditionally used with other defines
There are several cases where PERL_MICRO is used combined with defines
not set in uconfig.h, the additional test isn't needed.
Diffstat (limited to 'pp_sys.c')
| -rw-r--r-- | pp_sys.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -3999,13 +3999,13 @@ PP(pp_fork) #ifdef HAS_FORK dVAR; dSP; dTARGET; Pid_t childpid; -#if defined(HAS_SIGPROCMASK) && !defined(PERL_MICRO) +#ifdef HAS_SIGPROCMASK sigset_t oldmask, newmask; #endif EXTEND(SP, 1); PERL_FLUSHALL_FOR_CHILD; -#if defined(HAS_SIGPROCMASK) && !defined(PERL_MICRO) +#ifdef HAS_SIGPROCMASK sigfillset(&newmask); sigprocmask(SIG_SETMASK, &newmask, &oldmask); #endif @@ -4017,7 +4017,7 @@ PP(pp_fork) for (sig = 1; sig < SIG_SIZE; sig++) PL_psig_pend[sig] = 0; } -#if defined(HAS_SIGPROCMASK) && !defined(PERL_MICRO) +#ifdef HAS_SIGPROCMASK { dSAVE_ERRNO; sigprocmask(SIG_SETMASK, &oldmask, NULL); @@ -4136,13 +4136,13 @@ PP(pp_system) Pid_t childpid; int pp[2]; I32 did_pipes = 0; -#if (defined(HAS_SIGPROCMASK) && !defined(PERL_MICRO)) +#ifdef HAS_SIGPROCMASK sigset_t newset, oldset; #endif if (PerlProc_pipe(pp) >= 0) did_pipes = 1; -#if (defined(HAS_SIGPROCMASK) && !defined(PERL_MICRO)) +#ifdef HAS_SIGPROCMASK sigemptyset(&newset); sigaddset(&newset, SIGCHLD); sigprocmask(SIG_BLOCK, &newset, &oldset); @@ -4156,7 +4156,7 @@ PP(pp_system) PerlLIO_close(pp[0]); PerlLIO_close(pp[1]); } -#if (defined(HAS_SIGPROCMASK) && !defined(PERL_MICRO)) +#ifdef HAS_SIGPROCMASK sigprocmask(SIG_SETMASK, &oldset, NULL); #endif RETURN; @@ -4210,7 +4210,7 @@ PP(pp_system) XPUSHi(STATUS_CURRENT); RETURN; } -#if (defined(HAS_SIGPROCMASK) && !defined(PERL_MICRO)) +#ifdef HAS_SIGPROCMASK sigprocmask(SIG_SETMASK, &oldset, NULL); #endif if (did_pipes) { |