svn commit: r171192 - /perl/modperl/trunk/src/modules/perl/mod_perl.h /perl/modperl/trunk/src/modules/perl/modperl_module.c

[stas]

Author: stas
Date: Fri May 20 20:32:14 2005
New Revision: 171192

URL: http://svn.apache.org/viewcvs?rev=171192&view=rev
Log:
move the if (orig_perl) check into the macro, so other places can benefit from 
it

Modified:
    perl/modperl/trunk/src/modules/perl/mod_perl.h
    perl/modperl/trunk/src/modules/perl/modperl_module.c

Modified: perl/modperl/trunk/src/modules/perl/mod_perl.h
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/src/modules/perl/mod_perl.h?rev=171192&r1=171191&r2=171192&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/mod_perl.h (original)
+++ perl/modperl/trunk/src/modules/perl/mod_perl.h Fri May 20 20:32:14 2005
@@ -169,7 +169,7 @@
 #ifdef USE_ITHREADS
 
 #define MP_PERL_CONTEXT_DECLARE                 \
-    PerlInterpreter *orig_perl;                 \
+    PerlInterpreter *orig_perl = NULL;          \
     pTHX;
 
 #define MP_PERL_CONTEXT_STORE                   \
@@ -184,7 +184,9 @@
     MP_PERL_CONTEXT_OVERRIDE(new_perl)
 
 #define MP_PERL_CONTEXT_RESTORE                 \
-    PERL_SET_CONTEXT(orig_perl);
+    if (orig_perl) {                            \
+        PERL_SET_CONTEXT(orig_perl);            \
+    }
 
 #else /* #ifdef USE_ITHREADS */
 

Modified: perl/modperl/trunk/src/modules/perl/modperl_module.c
URL: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/src/modules/perl/modperl_module.c?rev=171192&r1=171191&r2=171192&view=diff
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_module.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_module.c Fri May 20 20:32:14 
2005
@@ -194,9 +194,7 @@
 #ifdef USE_ITHREADS
         /* XXX: breaks prefork
            modperl_interp_unselect(interp); */
-        if (orig_perl) {
-            MP_PERL_CONTEXT_RESTORE;
-        }
+        MP_PERL_CONTEXT_RESTORE;
 #endif
         return addv;
     }
@@ -249,9 +247,7 @@
 #ifdef USE_ITHREADS
     /* XXX: breaks prefork
        modperl_interp_unselect(interp); */
-    if (orig_perl) {
-        MP_PERL_CONTEXT_RESTORE;
-    }
+    MP_PERL_CONTEXT_RESTORE;
 #endif
     
     return (void *)mrg;