cvs commit: modperl-2.0/src/modules/perl mod_perl.c

[geoff]

geoff       2004/02/13 06:58:05

  Modified:    src/modules/perl mod_perl.c
  Log:
  be rid of warnings spotted by newer compilers
  
  Revision  Changes    Path
  1.208     +8 -10     modperl-2.0/src/modules/perl/mod_perl.c
  
  Index: mod_perl.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.c,v
  retrieving revision 1.207
  retrieving revision 1.208
  diff -u -r1.207 -r1.208
  --- mod_perl.c        12 Feb 2004 23:06:23 -0000      1.207
  +++ mod_perl.c        13 Feb 2004 14:58:05 -0000      1.208
  @@ -849,26 +849,24 @@
           return DECLINED;
       }
   
  -    /* default is -SetupEnv, add if PerlOption +SetupEnv */
  -    if (MpDirSETUP_ENV(dcfg)) {
   #ifdef USE_ITHREADS
  -        interp = modperl_interp_select(r, r->connection, r->server);
  -        aTHX = interp->perl;
  +    interp = modperl_interp_select(r, r->connection, r->server);
  +    aTHX = interp->perl;
   #endif
   
  +    /* default is -SetupEnv, add if PerlOption +SetupEnv */
  +    if (MpDirSETUP_ENV(dcfg)) {
           modperl_env_request_populate(aTHX_ r);
       }
   
       retval = modperl_response_handler_run(r, TRUE);
   
  -    if (MpDirSETUP_ENV(dcfg)) {
   #ifdef USE_ITHREADS
  -        if (MpInterpPUTBACK(interp)) {
  -            /* PerlInterpScope handler */
  -            modperl_interp_unselect(interp);
  -        }
  -#endif
  +    if (MpInterpPUTBACK(interp)) {
  +        /* PerlInterpScope handler */
  +        modperl_interp_unselect(interp);
       }
  +#endif
   
       return retval;
   }