dougm 01/10/20 23:22:45
Modified: lib/Apache Build.pm
src/modules/perl modperl_util.h
Log:
turn of __inline__ under win32 for the moment to avoid link troubles
Revision Changes Path
1.61 +3 -1 modperl-2.0/lib/Apache/Build.pm
Index: Build.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- Build.pm 2001/10/21 05:24:52 1.60
+++ Build.pm 2001/10/21 06:22:45 1.61
@@ -760,8 +760,10 @@
sub dynamic_link_MSWin32 {
my $self = shift;
+ my @defs = map "-def:$self->{cwd}/xs/modperl$_.def",
+ ("", "_inline");
return $self->dynamic_link_header_default .
- "-def:$self->{cwd}/xs/modperl.def" . <<'EOF';
+ "@defs" . <<'EOF';
-out:$@
EOF
}
1.28 +5 -0 modperl-2.0/src/modules/perl/modperl_util.h
Index: modperl_util.h
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_util.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- modperl_util.h 2001/10/14 18:00:23 1.27
+++ modperl_util.h 2001/10/21 06:22:45 1.28
@@ -9,6 +9,11 @@
#ifdef WIN32
# define MP_FUNC_T(name) (_stdcall *name)
+/* XXX: not all functions get inlined
+ * so its unclear what to and not to include in the .def files
+ */
+# undef MP_INLINE
+# define MP_INLINE
#else
# define MP_FUNC_T(name) (*name)
#endif
