You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by ra...@apache.org on 2005/04/06 23:17:21 UTC

svn commit: r160327 - in perl/modperl/trunk: lib/Apache2/Build.pm xs/Apache2/Access/Apache2__Access.h xs/Apache2/Directive/Apache2__Directive.h xs/Apache2/Filter/Apache2__Filter.h xs/Apache2/Log/Apache2__Log.h xs/Apache2/SubProcess/Apache2__SubProcess.h

Author: randyk
Date: Wed Apr  6 14:17:18 2005
New Revision: 160327

URL: http://svn.apache.org/viewcvs?view=rev&rev=160327
Log:
Some of the patch referenced in (and subsequently applied in trunk) at
   http://marc.theaimsgroup.com/?l=apache-modperl&m=111179742801206&w=2
did not survive the recent merge of the apache2-rename branch to
the trunk.

Modified:
    perl/modperl/trunk/lib/Apache2/Build.pm
    perl/modperl/trunk/xs/Apache2/Access/Apache2__Access.h
    perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h
    perl/modperl/trunk/xs/Apache2/Filter/Apache2__Filter.h
    perl/modperl/trunk/xs/Apache2/Log/Apache2__Log.h
    perl/modperl/trunk/xs/Apache2/SubProcess/Apache2__SubProcess.h

Modified: perl/modperl/trunk/lib/Apache2/Build.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Build.pm?view=diff&r1=160326&r2=160327
==============================================================================
--- perl/modperl/trunk/lib/Apache2/Build.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Build.pm Wed Apr  6 14:17:18 2005
@@ -29,6 +29,7 @@
 
 use constant AIX     => $^O eq 'aix';
 use constant DARWIN  => $^O eq 'darwin';
+use constant CYGWIN  => $^O eq 'cygwin';
 use constant IRIX    => $^O eq 'irix';
 use constant HPUX    => $^O eq 'hpux';
 use constant OPENBSD => $^O eq 'openbsd';
@@ -547,6 +548,10 @@
         unless ($optim =~ /-DDEBUGGING/) {
             $cflags =~ s/$optim//;
        }
+    }
+
+    if (CYGWIN) {
+        $cflags .= " -DCYGWIN ";
     }
 
     $cflags;

Modified: perl/modperl/trunk/xs/Apache2/Access/Apache2__Access.h
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/Apache2/Access/Apache2__Access.h?view=diff&r1=160326&r2=160327
==============================================================================
--- perl/modperl/trunk/xs/Apache2/Access/Apache2__Access.h (original)
+++ perl/modperl/trunk/xs/Apache2/Access/Apache2__Access.h Wed Apr  6 14:17:18 2005
@@ -111,7 +111,7 @@
     return ap_auth_name(r);
 }
 
-static XS(MPXS_ap_get_basic_auth_pw)
+MP_STATIC XS(MPXS_ap_get_basic_auth_pw)
 {
     dXSARGS;
     request_rec *r;

Modified: perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h?view=diff&r1=160326&r2=160327
==============================================================================
--- perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h (original)
+++ perl/modperl/trunk/xs/Apache2/Directive/Apache2__Directive.h Wed Apr  6 14:17:18 2005
@@ -116,7 +116,7 @@
     return newRV_noinc((SV *)hash);
 }
 
-static XS(MPXS_Apache2__Directive_lookup)
+MP_STATIC XS(MPXS_Apache2__Directive_lookup)
 {
     dXSARGS;
 

Modified: perl/modperl/trunk/xs/Apache2/Filter/Apache2__Filter.h
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/Apache2/Filter/Apache2__Filter.h?view=diff&r1=160326&r2=160327
==============================================================================
--- perl/modperl/trunk/xs/Apache2/Filter/Apache2__Filter.h (original)
+++ perl/modperl/trunk/xs/Apache2/Filter/Apache2__Filter.h Wed Apr  6 14:17:18 2005
@@ -114,7 +114,7 @@
     }
 
 
-static XS(MPXS_modperl_filter_attributes)
+MP_STATIC XS(MPXS_modperl_filter_attributes)
 {
     dXSARGS;
     U32 *attrs = modperl_filter_attributes(ST(0), ST(1));

Modified: perl/modperl/trunk/xs/Apache2/Log/Apache2__Log.h
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/Apache2/Log/Apache2__Log.h?view=diff&r1=160326&r2=160327
==============================================================================
--- perl/modperl/trunk/xs/Apache2/Log/Apache2__Log.h (original)
+++ perl/modperl/trunk/xs/Apache2/Log/Apache2__Log.h Wed Apr  6 14:17:18 2005
@@ -137,7 +137,7 @@
 #define my_do_join(m, s)                        \
     modperl_perl_do_join(aTHX_ (m), (s))
 
-static XS(MPXS_Apache2__Log_dispatch)
+MP_STATIC XS(MPXS_Apache2__Log_dispatch)
 {
     dXSARGS;
     SV *msgsv;
@@ -195,7 +195,7 @@
     XSRETURN_EMPTY;
 }
 
-static XS(MPXS_Apache2__Log_LOG_MARK)
+MP_STATIC XS(MPXS_Apache2__Log_LOG_MARK)
 {
     dXSARGS;
     ax = ax; /* -Wall */;
@@ -213,7 +213,7 @@
     });
 }
 
-static XS(MPXS_Apache2__Log_log_xerror)
+MP_STATIC XS(MPXS_Apache2__Log_log_xerror)
 {
     dXSARGS;
     SV *msgsv = Nullsv;
@@ -276,7 +276,7 @@
  * $s->warn
  * Apache2::ServerRec::warn
  */
-static XS(MPXS_Apache2__Log_log_error)
+MP_STATIC XS(MPXS_Apache2__Log_log_error)
 {
     dXSARGS;
     request_rec *r = NULL;

Modified: perl/modperl/trunk/xs/Apache2/SubProcess/Apache2__SubProcess.h
URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/Apache2/SubProcess/Apache2__SubProcess.h?view=diff&r1=160326&r2=160327
==============================================================================
--- perl/modperl/trunk/xs/Apache2/SubProcess/Apache2__SubProcess.h (original)
+++ perl/modperl/trunk/xs/Apache2/SubProcess/Apache2__SubProcess.h Wed Apr  6 14:17:18 2005
@@ -128,7 +128,7 @@
         XSRETURN_UNDEF;                         \
     }
 
-static XS(MPXS_modperl_spawn_proc_prog)
+MP_STATIC XS(MPXS_modperl_spawn_proc_prog)
 {
     dXSARGS;
     const char *usage = "Usage: spawn_proc_prog($r, $command, [\\@argv])";