>
>We can do that. But it should be done in one place and not repeated in all
>files. So could you apply this patch:
>
>[...]
>and then s/static/MP_STATIC/ in all the places you have a problem with and
>resubmit a new patch?
>
>Thanks.
There it is :)
-----------------------------------------------------------------
http://gbg.bg/search - Изпробвайте още сега най-добрата българска търсачка!
Index: src/modules/perl/modperl_common_util.h
===================================================================
--- src/modules/perl/modperl_common_util.h (revision 159073)
+++ src/modules/perl/modperl_common_util.h (working copy)
@@ -25,6 +25,12 @@
#define MP_INLINE APR_INLINE
#endif
+#ifdef CYGWIN
+#define MP_STATIC
+#else
+#define MP_STATIC static
+#endif
+
#ifdef WIN32
# define MP_FUNC_T(name) (_stdcall *name)
# define MP_FUNC_NONSTD_T(name) (*name)
Index: xs/Apache/Log/Apache__Log.h
===================================================================
--- xs/Apache/Log/Apache__Log.h (revision 159073)
+++ xs/Apache/Log/Apache__Log.h (working copy)
@@ -137,7 +137,7 @@
#define my_do_join(m, s) \
modperl_perl_do_join(aTHX_ (m), (s))
-static XS(MPXS_Apache__Log_dispatch)
+MP_STATIC XS(MPXS_Apache__Log_dispatch)
{
dXSARGS;
SV *msgsv;
@@ -195,7 +195,7 @@
XSRETURN_EMPTY;
}
-static XS(MPXS_Apache__Log_LOG_MARK)
+MP_STATIC XS(MPXS_Apache__Log_LOG_MARK)
{
dXSARGS;
ax = ax; /* -Wall */;
@@ -213,7 +213,7 @@
});
}
-static XS(MPXS_Apache__Log_log_xerror)
+MP_STATIC XS(MPXS_Apache__Log_log_xerror)
{
dXSARGS;
SV *msgsv = Nullsv;
@@ -276,7 +276,7 @@
* $s->warn
* Apache::ServerRec::warn
*/
-static XS(MPXS_Apache__Log_log_error)
+MP_STATIC XS(MPXS_Apache__Log_log_error)
{
dXSARGS;
request_rec *r = NULL;
Index: xs/Apache/Filter/Apache__Filter.h
===================================================================
--- xs/Apache/Filter/Apache__Filter.h (revision 159073)
+++ xs/Apache/Filter/Apache__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/Apache/SubProcess/Apache__SubProcess.h
===================================================================
--- xs/Apache/SubProcess/Apache__SubProcess.h (revision 159073)
+++ xs/Apache/SubProcess/Apache__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/Apache/Access/Apache__Access.h
===================================================================
--- xs/Apache/Access/Apache__Access.h (revision 159073)
+++ xs/Apache/Access/Apache__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/APR/Base64/APR__Base64.h
===================================================================
--- xs/APR/Base64/APR__Base64.h (revision 159073)
+++ xs/APR/Base64/APR__Base64.h (working copy)
@@ -33,7 +33,7 @@
mpxs_sv_cur_set(sv, decoded_len);
}
-static XS(MPXS_apr_base64_encode)
+MP_STATIC XS(MPXS_apr_base64_encode)
{
dXSARGS;
@@ -42,7 +42,7 @@
mpxs_set_targ(mpxs_apr_base64_encode, ST(0));
}
-static XS(MPXS_apr_base64_decode)
+MP_STATIC XS(MPXS_apr_base64_decode)
{
dXSARGS;
Index: xs/APR/Table/APR__Table.h
===================================================================
--- xs/APR/Table/APR__Table.h (revision 159073)
+++ xs/APR/Table/APR__Table.h (working copy)
@@ -193,7 +193,7 @@
}
-static XS(MPXS_apr_table_get)
+MP_STATIC XS(MPXS_apr_table_get)
{
dXSARGS;
Index: xs/APR/UUID/APR__UUID.h
===================================================================
--- xs/APR/UUID/APR__UUID.h (revision 159073)
+++ xs/APR/UUID/APR__UUID.h (working copy)
@@ -38,7 +38,7 @@
return uuid;
}
-static XS(MPXS_apr_uuid_format)
+MP_STATIC XS(MPXS_apr_uuid_format)
{
dXSARGS;
Index: lib/Apache/Build.pm
===================================================================
--- lib/Apache/Build.pm (revision 159073)
+++ lib/Apache/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;
}
Index: xs/Apache/Directive/Apache__Directive.h
===================================================================
--- xs/Apache/Directive/Apache__Directive.h (revision 159073)
+++ xs/Apache/Directive/Apache__Directive.h (working copy)
@@ -116,7 +116,7 @@
return newRV_noinc((SV *)hash);
}
-static XS(MPXS_Apache__Directive_lookup)
+MP_STATIC XS(MPXS_Apache__Directive_lookup)
{
dXSARGS;
