perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject cvs commit: modperl-2.0/xs/APR/Pool APR__Pool.h
Date Thu, 01 Jul 2004 01:44:42 GMT
stas        2004/06/30 18:44:42

  Modified:    xs/APR/PerlIO modperl_apr_perlio.h
               xs/APR/Pool APR__Pool.h
  Log:
  source_scan doesn't grok optional function, so ifdef those declarations,
  so that source_scan works again
  
  Revision  Changes    Path
  1.2       +2 -0      modperl-2.0/xs/APR/PerlIO/modperl_apr_perlio.h
  
  Index: modperl_apr_perlio.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/APR/PerlIO/modperl_apr_perlio.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -u -r1.1 -r1.2
  --- modperl_apr_perlio.h	27 Jun 2004 23:41:07 -0000	1.1
  +++ modperl_apr_perlio.h	1 Jul 2004 01:44:42 -0000	1.2
  @@ -43,7 +43,9 @@
       APR_PERLIO_HOOK_WRITE
   } apr_perlio_hook_e;
   
  +#ifndef MP_SOURCE_SCAN
   void apr_perlio_init(pTHX);
  +#endif
   
   /* The following functions can be used from other .so libs, they just
    * need to load APR::PerlIO perl module first
  
  
  
  1.16      +5 -1      modperl-2.0/xs/APR/Pool/APR__Pool.h
  
  Index: APR__Pool.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/APR/Pool/APR__Pool.h,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -u -r1.15 -r1.16
  --- APR__Pool.h	25 Jun 2004 15:29:25 -0000	1.15
  +++ APR__Pool.h	1 Jul 2004 01:44:42 -0000	1.16
  @@ -203,7 +203,11 @@
    * @param data   internal storage
    */
   
  -static APR_OPTIONAL_FN_TYPE(modperl_interp_unselect) *modperl_opt_interp_unselect;
  +#ifndef MP_SOURCE_SCAN
  +#include "apr_optional.h"
  +static
  +APR_OPTIONAL_FN_TYPE(modperl_interp_unselect) *modperl_opt_interp_unselect;
  +#endif
   
   static apr_status_t mpxs_cleanup_run(void *data)
   {
  
  
  

Mime
View raw message