svn commit: r1593957 - in /perl/modperl/branches/httpd24threading/src/modules/perl: modperl_interp.h modperl_util.c

[jkaluza]

Author: jkaluza
Date: Mon May 12 13:05:08 2014
New Revision: 1593957

URL: http://svn.apache.org/r1593957
Log:
Fix compilation with MP_NO_THREADS=1 by using MP_HAS_INTERP in conditions
checking for "interp".

Modified:
    perl/modperl/branches/httpd24threading/src/modules/perl/modperl_interp.h
    perl/modperl/branches/httpd24threading/src/modules/perl/modperl_util.c

Modified: 
perl/modperl/branches/httpd24threading/src/modules/perl/modperl_interp.h
URL: 
http://svn.apache.org/viewvc/perl/modperl/branches/httpd24threading/src/modules/perl/modperl_interp.h?rev=1593957&r1=1593956&r2=1593957&view=diff
==============================================================================
--- perl/modperl/branches/httpd24threading/src/modules/perl/modperl_interp.h 
(original)
+++ perl/modperl/branches/httpd24threading/src/modules/perl/modperl_interp.h 
Mon May 12 13:05:08 2014
@@ -104,6 +104,8 @@ modperl_interp_t *modperl_interp_select(
 
 #define MP_INTERP_REFCNT_dec(interp) MP_INTERP_PUTBACK(interp, NULL)
 
+#define MP_HAS_INTERP(interp) (interp != NULL)
+
 #define MP_aTHX aTHX
 
 apr_status_t modperl_interp_pool_destroy(void *data);
@@ -140,6 +142,8 @@ void modperl_interp_mip_walk_servers(Per
 
 #define MP_INTERP_REFCNT_dec(interp) NOOP
 
+#define MP_HAS_INTERP(interp) (1)
+
 #define MP_aTHX 0
 
 #endif /* USE_ITHREADS */

Modified: perl/modperl/branches/httpd24threading/src/modules/perl/modperl_util.c
URL: 
http://svn.apache.org/viewvc/perl/modperl/branches/httpd24threading/src/modules/perl/modperl_util.c?rev=1593957&r1=1593956&r2=1593957&view=diff
==============================================================================
--- perl/modperl/branches/httpd24threading/src/modules/perl/modperl_util.c 
(original)
+++ perl/modperl/branches/httpd24threading/src/modules/perl/modperl_util.c Mon 
May 12 13:05:08 2014
@@ -1010,7 +1010,7 @@ static const char *perl_parse_require_li
          * at that time.
          */
         MP_dINTERP_POOLa(cmd->pool, cmd->server);
-        if (!interp) {
+        if (!MP_HAS_INTERP(interp)) {
            return "Require handler is not currently supported in this context";
        }