perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@hyperreal.org
Subject cvs commit: modperl/src/modules/perl mod_perl.h
Date Mon, 02 Nov 1998 19:31:43 GMT
dougm       98/11/02 11:31:43

  Modified:    .        Changes Makefile.PL
               apaci    mod_perl.config.sh
               src/modules/perl mod_perl.h
  Log:
  rename PERL_VERSION macro to PERLV to avoid conflict with 5.00502's
  
  Revision  Changes    Path
  1.184     +2 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /export/home/cvs/modperl/Changes,v
  retrieving revision 1.183
  retrieving revision 1.184
  diff -u -r1.183 -r1.184
  --- Changes	1998/10/29 20:53:24	1.183
  +++ Changes	1998/11/02 19:31:40	1.184
  @@ -8,6 +8,8 @@
   
   =item 1.16_01-dev
   
  +rename PERL_VERSION macro to PERLV to avoid conflict with 5.00502's 
  +
   rename Apache::Tie/Apache::TieHashTable -> Apache::Table
   
   Apache::PerlRun::handler will explicitly undef subroutines before
  
  
  
  1.108     +5 -5      modperl/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /export/home/cvs/modperl/Makefile.PL,v
  retrieving revision 1.107
  retrieving revision 1.108
  diff -u -r1.107 -r1.108
  --- Makefile.PL	1998/10/30 04:37:27	1.107
  +++ Makefile.PL	1998/11/02 19:31:40	1.108
  @@ -33,7 +33,7 @@
   my $USE_THREADS = 
       (defined($Config{usethreads}) && ($Config{usethreads} eq "define"));
      
  -$PERL_VERSION = perl_version();
  +$PERLV = perl_version();
   
   require "./lib/mod_perl.pm";
   $VERSION = $mod_perl::VERSION = $mod_perl::VERSION;
  @@ -783,7 +783,7 @@
   #---------------------------------------------------------------------
   
   MOD_PERL_VERSION = $VERSION
  -PERL_VERSION = $PERL_VERSION
  +PERLV = $PERLV
   
   INCDIR = $incdir
   
  @@ -1100,7 +1100,7 @@
           APACHE_ROOT => $APACHE_ROOT,
           APACHE_SRC => $APACHE_SRC,
   	ARCHNAME => $Config{archname},
  -	PERL_VERSION => $]+0,
  +	PERLV => $]+0,
   	HTTPD => (is_ssl() ? "httpsd" : "httpd"),
   	PORT => $PORT,
   	PWD => $PWD,
  @@ -1563,7 +1563,7 @@
       $inc .= $SSL_INCLUDE if $SSL_INCLUDE;
       $inc .= " -DSTRONGHOLD" if is_ssl() =~ /stronghold/i;
       $inc .= " $PERL_EXTRA_CFLAGS" if $PERL_EXTRA_CFLAGS;
  -    $inc .= " -DMOD_PERL -DPERL_VERSION=$PERL_VERSION";
  +    $inc .= " -DMOD_PERL -DPERLV=$PERLV";
   
       while (<$fh>) {
   	push @file, $_;
  @@ -1846,7 +1846,7 @@
   
   #   mod_perl version
   MOD_PERL_VERSION = $VERSION
  -PERL_VERSION = $PERL_VERSION
  +PERLV = $PERLV
   
   #   Perl interpreter to use 
   PERL = $^X
  
  
  
  1.10      +1 -1      modperl/apaci/mod_perl.config.sh
  
  Index: mod_perl.config.sh
  ===================================================================
  RCS file: /export/home/cvs/modperl/apaci/mod_perl.config.sh,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- mod_perl.config.sh	1998/09/17 16:09:41	1.9
  +++ mod_perl.config.sh	1998/11/02 19:31:42	1.10
  @@ -154,7 +154,7 @@
   perl_defs=''
   perl_defs="$perl_defs -DMOD_PERL_VERSION=\\\"$param_MOD_PERL_VERSION\\\""
   perl_defs="$perl_defs -DMOD_PERL_STRING_VERSION=\\\"mod_perl/$param_MOD_PERL_VERSION\\\""
  -perl_defs="$perl_defs -DPERL_VERSION=$param_PERL_VERSION"
  +perl_defs="$perl_defs -DPERLV=$param_PERLV"
   OIFS="$IFS" IFS="$DIFS"
   for hook in \
       DISPATCH CHILD_INIT CHILD_EXIT POST_READ_REQUEST TRANS HEADER_PARSER \
  
  
  
  1.57      +3 -3      modperl/src/modules/perl/mod_perl.h
  
  Index: mod_perl.h
  ===================================================================
  RCS file: /export/home/cvs/modperl/src/modules/perl/mod_perl.h,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- mod_perl.h	1998/10/29 20:53:31	1.56
  +++ mod_perl.h	1998/11/02 19:31:42	1.57
  @@ -49,8 +49,8 @@
    * plus chance that another patchlevel.h might be in -I paths
    * so try to avoid it if possible 
    */ 
  -#ifdef PERL_VERSION
  -#if PERL_VERSION >= 500476
  +#ifdef PERLV
  +#if PERLV >= 500476
   #include "perl_PL.h"
   #endif
   #else
  @@ -58,7 +58,7 @@
   #if ((PATCHLEVEL >= 4) && (SUBVERSION >= 76)) || (PATCHLEVEL >= 5)
   #include "perl_PL.h"
   #endif
  -#endif /*PERL_VERSION*/
  +#endif /*PERLV*/
   
   #ifdef PERL_OBJECT
   #include <perlhost.h>
  
  
  

Mime
View raw message