Author: stas Date: Sun Mar 27 07:21:07 2005 New Revision: 159153 URL: http://svn.apache.org/viewcvs?view=rev&rev=159153 Log: cygwin fixes: - doesn't like XS wrapper starting with 'static' - need to compile everything with -DCYGWIN Contributed by: Nick *** <[EMAIL PROTECTED]>
Modified: perl/modperl/trunk/lib/Apache/Build.pm perl/modperl/trunk/src/modules/perl/modperl_common_util.h perl/modperl/trunk/xs/APR/Base64/APR__Base64.h perl/modperl/trunk/xs/APR/Table/APR__Table.h perl/modperl/trunk/xs/APR/UUID/APR__UUID.h perl/modperl/trunk/xs/Apache/Access/Apache__Access.h perl/modperl/trunk/xs/Apache/Directive/Apache__Directive.h perl/modperl/trunk/xs/Apache/Filter/Apache__Filter.h perl/modperl/trunk/xs/Apache/Log/Apache__Log.h perl/modperl/trunk/xs/Apache/SubProcess/Apache__SubProcess.h Modified: perl/modperl/trunk/lib/Apache/Build.pm URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache/Build.pm?view=diff&r1=159152&r2=159153 ============================================================================== --- perl/modperl/trunk/lib/Apache/Build.pm (original) +++ perl/modperl/trunk/lib/Apache/Build.pm Sun Mar 27 07:21:07 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/src/modules/perl/modperl_common_util.h URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/src/modules/perl/modperl_common_util.h?view=diff&r1=159152&r2=159153 ============================================================================== --- perl/modperl/trunk/src/modules/perl/modperl_common_util.h (original) +++ perl/modperl/trunk/src/modules/perl/modperl_common_util.h Sun Mar 27 07:21:07 2005 @@ -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) Modified: perl/modperl/trunk/xs/APR/Base64/APR__Base64.h URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/APR/Base64/APR__Base64.h?view=diff&r1=159152&r2=159153 ============================================================================== --- perl/modperl/trunk/xs/APR/Base64/APR__Base64.h (original) +++ perl/modperl/trunk/xs/APR/Base64/APR__Base64.h Sun Mar 27 07:21:07 2005 @@ -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; Modified: perl/modperl/trunk/xs/APR/Table/APR__Table.h URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/APR/Table/APR__Table.h?view=diff&r1=159152&r2=159153 ============================================================================== --- perl/modperl/trunk/xs/APR/Table/APR__Table.h (original) +++ perl/modperl/trunk/xs/APR/Table/APR__Table.h Sun Mar 27 07:21:07 2005 @@ -193,7 +193,7 @@ } -static XS(MPXS_apr_table_get) +MP_STATIC XS(MPXS_apr_table_get) { dXSARGS; Modified: perl/modperl/trunk/xs/APR/UUID/APR__UUID.h URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/APR/UUID/APR__UUID.h?view=diff&r1=159152&r2=159153 ============================================================================== --- perl/modperl/trunk/xs/APR/UUID/APR__UUID.h (original) +++ perl/modperl/trunk/xs/APR/UUID/APR__UUID.h Sun Mar 27 07:21:07 2005 @@ -38,7 +38,7 @@ return uuid; } -static XS(MPXS_apr_uuid_format) +MP_STATIC XS(MPXS_apr_uuid_format) { dXSARGS; Modified: perl/modperl/trunk/xs/Apache/Access/Apache__Access.h URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/Apache/Access/Apache__Access.h?view=diff&r1=159152&r2=159153 ============================================================================== --- perl/modperl/trunk/xs/Apache/Access/Apache__Access.h (original) +++ perl/modperl/trunk/xs/Apache/Access/Apache__Access.h Sun Mar 27 07:21:07 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/Apache/Directive/Apache__Directive.h URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/Apache/Directive/Apache__Directive.h?view=diff&r1=159152&r2=159153 ============================================================================== --- perl/modperl/trunk/xs/Apache/Directive/Apache__Directive.h (original) +++ perl/modperl/trunk/xs/Apache/Directive/Apache__Directive.h Sun Mar 27 07:21:07 2005 @@ -116,7 +116,7 @@ return newRV_noinc((SV *)hash); } -static XS(MPXS_Apache__Directive_lookup) +MP_STATIC XS(MPXS_Apache__Directive_lookup) { dXSARGS; Modified: perl/modperl/trunk/xs/Apache/Filter/Apache__Filter.h URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/Apache/Filter/Apache__Filter.h?view=diff&r1=159152&r2=159153 ============================================================================== --- perl/modperl/trunk/xs/Apache/Filter/Apache__Filter.h (original) +++ perl/modperl/trunk/xs/Apache/Filter/Apache__Filter.h Sun Mar 27 07:21:07 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/Apache/Log/Apache__Log.h URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/Apache/Log/Apache__Log.h?view=diff&r1=159152&r2=159153 ============================================================================== --- perl/modperl/trunk/xs/Apache/Log/Apache__Log.h (original) +++ perl/modperl/trunk/xs/Apache/Log/Apache__Log.h Sun Mar 27 07:21:07 2005 @@ -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; Modified: perl/modperl/trunk/xs/Apache/SubProcess/Apache__SubProcess.h URL: http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/Apache/SubProcess/Apache__SubProcess.h?view=diff&r1=159152&r2=159153 ============================================================================== --- perl/modperl/trunk/xs/Apache/SubProcess/Apache__SubProcess.h (original) +++ perl/modperl/trunk/xs/Apache/SubProcess/Apache__SubProcess.h Sun Mar 27 07:21:07 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, [EMAIL PROTECTED])";