Microperl sync.

p4raw-id: //depot/perl@8622

diff --git a/mg.c b/mg.c
index 8165302..bb9509a 100644 (file)
--- a/mg.c
+++ b/mg.c
@@ -2264,6 +2264,7 @@ Perl_sighandler(int sig)
 
     POPSTACK;
     if (SvTRUE(ERRSV)) {
+#ifndef PERL_MICRO
 #ifdef HAS_SIGPROCMASK
        /* Handler "died", for example to get out of a restart-able read().
         * Before we re-do that on its behalf re-enable the signal which was
@@ -2278,6 +2279,7 @@ Perl_sighandler(int sig)
        (void)rsignal(sig, SIG_IGN);
        (void)rsignal(sig, &Perl_csighandler);
 #endif
+#endif /* !PERL_MICRO */
        Perl_die(aTHX_ Nullch);
     }
 cleanup:

diff --git a/perl.h b/perl.h
index 93e53f1..7441ea5 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -3340,12 +3340,14 @@ typedef struct am_table_short AMTS;
  * massively.
  */
 
-#ifndef PERL_OLD_SIGNALS
-#define PERL_ASYNC_CHECK() if (PL_sig_pending) despatch_signals()
+#ifndef PERL_MICRO
+#   ifndef PERL_OLD_SIGNALS
+#       define PERL_ASYNC_CHECK() if (PL_sig_pending) despatch_signals()
+#   endif
 #endif
 
 #ifndef PERL_ASYNC_CHECK
-#define PERL_ASYNC_CHECK()  NOOP
+#   define PERL_ASYNC_CHECK()  NOOP
 #endif
 
 /*