perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: modperl-2.0/src/modules/perl modperl_apache_includes.h modperl_perl_includes.h mod_perl.h
Date Sat, 06 Jan 2001 02:52:03 GMT
dougm       01/01/05 18:52:03

  Modified:    lib/ModPerl Code.pm
               src/modules/perl mod_perl.h
  Added:       src/modules/perl modperl_apache_includes.h
                        modperl_perl_includes.h
  Log:
  move Apache #include-s into modperl_apache_includes.h
  move Perl #include-s into modperl_perl_includes.h
  include Perl headers after Apache headers to avoid PerlIO conflicts
  
  Revision  Changes    Path
  1.36      +2 -1      modperl-2.0/lib/ModPerl/Code.pm
  
  Index: Code.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/Code.pm,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- Code.pm	2001/01/02 06:40:19	1.35
  +++ Code.pm	2001/01/06 02:52:02	1.36
  @@ -459,7 +459,8 @@
   sub o_pic_files { [map { "$_.lo" } @c_names, @g_c_names] }
   
   my @g_h_names = map { "modperl_$_" } qw(hooks directives flags trace);
  -my @h_names = (@c_names, qw(modperl_types));
  +my @h_names = (@c_names, map { "modperl_$_" }
  +               qw(types apache_includes perl_includes));
   sub h_files { [map { "$_.h" } @h_names, @g_h_names] }
   
   sub clean_files {
  
  
  
  1.21      +2 -35     modperl-2.0/src/modules/perl/mod_perl.h
  
  Index: mod_perl.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.h,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- mod_perl.h	2001/01/02 06:40:19	1.20
  +++ mod_perl.h	2001/01/06 02:52:03	1.21
  @@ -1,41 +1,8 @@
   #ifndef MOD_PERL_H
   #define MOD_PERL_H
   
  -#ifndef PERL_NO_GET_CONTEXT
  -#   define PERL_NO_GET_CONTEXT
  -#endif
  -
  -#define PERL_CORE
  -
  -#include "EXTERN.h"
  -#include "perl.h"
  -#include "XSUB.h"
  -
  -#ifdef PERL_CORE
  -#   ifndef croak
  -#      define croak Perl_croak_nocontext
  -#   endif
  -#endif
  -
  -#undef dNOOP
  -#define dNOOP extern int __attribute__ ((unused)) Perl___notused
  -
  -#define CORE_PRIVATE
  -#include "ap_mmn.h"
  -#include "httpd.h"
  -#include "http_config.h"
  -#include "http_log.h"
  -#include "http_protocol.h"
  -#include "http_main.h"
  -#include "http_request.h"
  -#include "http_connection.h"
  -#include "http_core.h"
  -
  -#include "apr_lock.h"
  -#include "apr_strings.h"
  -
  -#include "ap_buckets.h"
  -#include "util_filter.h"
  +#include "modperl_apache_includes.h"
  +#include "modperl_perl_includes.h"
   
   extern module MODULE_VAR_EXPORT perl_module;
   
  
  
  
  1.1                  modperl-2.0/src/modules/perl/modperl_apache_includes.h
  
  Index: modperl_apache_includes.h
  ===================================================================
  #ifndef MODPERL_APACHE_INCLUDES_H
  #define MODPERL_APACHE_INCLUDES_H
  
  /* header files for Apache */
  
  #define CORE_PRIVATE
  #include "ap_mmn.h"
  #include "httpd.h"
  #include "http_config.h"
  #include "http_log.h"
  #include "http_protocol.h"
  #include "http_main.h"
  #include "http_request.h"
  #include "http_connection.h"
  #include "http_core.h"
  
  #include "apr_lock.h"
  #include "apr_strings.h"
  
  #include "ap_buckets.h"
  #include "util_filter.h"
  
  #endif /* MODPERL_APACHE_INCLUDES_H */
  
  
  
  1.1                  modperl-2.0/src/modules/perl/modperl_perl_includes.h
  
  Index: modperl_perl_includes.h
  ===================================================================
  #ifndef MODPERL_PERL_INCLUDES
  #define MODPERL_PERL_INCLUDES
  
  /* header files for Perl */
  
  #ifndef PERL_NO_GET_CONTEXT
  #   define PERL_NO_GET_CONTEXT
  #endif
  
  #define PERLIO_NOT_STDIO 0
  #define PERL_CORE
  
  #include "EXTERN.h"
  #include "perl.h"
  #include "XSUB.h"
  
  #ifdef PERL_CORE
  #   ifndef croak
  #      define croak Perl_croak_nocontext
  #   endif
  #endif
  
  #undef dNOOP
  #define dNOOP extern int __attribute__ ((unused)) Perl___notused
  
  #endif /* MODPERL_PERL_INCLUDES */
  
  
  

Mime
View raw message