On Wed, 6 Apr 2005, Nick *** wrote:
> Something went wrong after the big merge. I did a fresh
> checkout and it seems like half of the patches are there
> but the other half aren't. For example, the patches for
> src/modules/perl/modperl_common_util.h and
> xs/APR/Base64/APR__Base64.h are fine, but the patches for
> the files that involve in their names 'Apache' (which
> currently is 'Apache2') are missing. Such missing patches
> are for these files: lib/Apache/Build.pm,
> xs/Apache/Directive/Apache__Directive.h,
> xs/Apache/Log/Apache__Log.h... and so on.
Does the following include all the missing patches?
=================================================================
Index: xs/Apache2/Log/Apache2__Log.h
===================================================================
--- xs/Apache2/Log/Apache2__Log.h (revision 160298)
+++ xs/Apache2/Log/Apache2__Log.h (working copy)
@@ -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;
Index: xs/Apache2/Filter/Apache2__Filter.h
===================================================================
--- xs/Apache2/Filter/Apache2__Filter.h (revision 160298)
+++ xs/Apache2/Filter/Apache2__Filter.h (working copy)
@@ -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));
Index: xs/Apache2/SubProcess/Apache2__SubProcess.h
===================================================================
--- xs/Apache2/SubProcess/Apache2__SubProcess.h (revision 160298)
+++ xs/Apache2/SubProcess/Apache2__SubProcess.h (working copy)
@@ -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, [EMAIL
PROTECTED])";
Index: xs/Apache2/Access/Apache2__Access.h
===================================================================
--- xs/Apache2/Access/Apache2__Access.h (revision 160298)
+++ xs/Apache2/Access/Apache2__Access.h (working copy)
@@ -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;
Index: xs/Apache2/Directive/Apache2__Directive.h
===================================================================
--- xs/Apache2/Directive/Apache2__Directive.h (revision 160298)
+++ xs/Apache2/Directive/Apache2__Directive.h (working copy)
@@ -116,7 +116,7 @@
return newRV_noinc((SV *)hash);
}
-static XS(MPXS_Apache2__Directive_lookup)
+MP_STATIC XS(MPXS_Apache2__Directive_lookup)
{
dXSARGS;
Index: lib/Apache2/Build.pm
===================================================================
--- lib/Apache2/Build.pm (revision 160298)
+++ lib/Apache2/Build.pm (working copy)
@@ -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';
@@ -549,6 +550,10 @@
}
}
+ if (CYGWIN) {
+ $cflags .= " -DCYGWIN ";
+ }
+
$cflags;
}
====================================================================
--
best regards,
randy
