cvs commit: modperl-2.0/xs/Apache/Log Apache__Log.h
dougm 2002/06/18 22:18:04
Modified:lib/ModPerl WrapXS.pm
src/modules/perl mod_perl.h modperl_perl_includes.h
modperl_util.c modperl_util.h
xs/Apache/Log Apache__Log.h
Log:
get the -DPERL_CORE optimization working again
Revision ChangesPath
1.47 +1 -1 modperl-2.0/lib/ModPerl/WrapXS.pm
Index: WrapXS.pm
===
RCS file: /home/cvs/modperl-2.0/lib/ModPerl/WrapXS.pm,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- WrapXS.pm 11 Jun 2002 16:27:57 - 1.46
+++ WrapXS.pm 19 Jun 2002 05:18:04 - 1.47
@@ -397,7 +397,7 @@
my $str = "";
if (my $boot = $self->typemap->{function_map}->{boot}->{$module}) {
-$str = 'mpxs_' . $self->cname($module) . "_BOOT(aTHXo);\n";
+$str = 'mpxs_' . $self->cname($module) . "_BOOT(aTHX);\n";
}
$str;
1.47 +1 -1 modperl-2.0/src/modules/perl/mod_perl.h
Index: mod_perl.h
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/mod_perl.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- mod_perl.h16 Jun 2002 01:07:37 - 1.46
+++ mod_perl.h19 Jun 2002 05:18:04 - 1.47
@@ -75,7 +75,7 @@
apr_pool_t *modperl_server_pool(void);
PerlInterpreter *modperl_startup(server_rec *s, apr_pool_t *p);
int modperl_perl_destruct_level(void);
-void xs_init(pTHXo);
+void xs_init(pTHX);
void modperl_response_init(request_rec *r);
void modperl_response_finish(request_rec *r);
1.16 +2 -0 modperl-2.0/src/modules/perl/modperl_perl_includes.h
Index: modperl_perl_includes.h
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_perl_includes.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- modperl_perl_includes.h 19 Jun 2002 02:02:24 - 1.15
+++ modperl_perl_includes.h 19 Jun 2002 05:18:04 - 1.16
@@ -9,6 +9,8 @@
#define PERLIO_NOT_STDIO 0
+#include "config.h"
+
/*
* sizeof(struct PerlInterpreter) changes #ifdef USE_LARGE_FILES
* apache-2.0 cannot be compiled with lfs because of sendfile.h
1.46 +1 -1 modperl-2.0/src/modules/perl/modperl_util.c
Index: modperl_util.c
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_util.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- modperl_util.c19 Jun 2002 02:02:24 - 1.45
+++ modperl_util.c19 Jun 2002 05:18:04 - 1.46
@@ -292,7 +292,7 @@
#define dl_librefs "DynaLoader::dl_librefs"
#define dl_modules "DynaLoader::dl_modules"
-void modperl_xs_dl_handles_clear(pTHXo)
+void modperl_xs_dl_handles_clear(pTHX)
{
AV *librefs = get_av(dl_librefs, FALSE);
if (librefs) {
1.34 +1 -1 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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- modperl_util.h23 May 2002 22:18:47 - 1.33
+++ modperl_util.h19 Jun 2002 05:18:04 - 1.34
@@ -73,7 +73,7 @@
char *modperl_server_desc(server_rec *s, apr_pool_t *p);
-void modperl_xs_dl_handles_clear(pTHXo);
+void modperl_xs_dl_handles_clear(pTHX);
apr_array_header_t *modperl_xs_dl_handles_get(pTHX_ apr_pool_t *p);
1.10 +1 -1 modperl-2.0/xs/Apache/Log/Apache__Log.h
Index: Apache__Log.h
===
RCS file: /home/cvs/modperl-2.0/xs/Apache/Log/Apache__Log.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Apache__Log.h 26 Mar 2002 03:37:47 - 1.9
+++ Apache__Log.h 19 Jun 2002 05:18:04 - 1.10
@@ -1,4 +1,4 @@
-static void mpxs_Apache__Log_BOOT(pTHXo)
+static void mpxs_Apache__Log_BOOT(pTHX)
{
av_push(get_av("Apache::Log::Request::ISA",TRUE),
newSVpv("Apache::Log",11));
cvs commit: modperl-2.0/src/modules/perl modperl_perl_includes.h modperl_util.c
dougm 2002/06/18 19:02:24
Modified:src/modules/perl modperl_perl_includes.h modperl_util.c
Log:
use mg_find to look for ~ magic in modperl_xs_sv2request_rec as there may be other
magic in the chain
Revision ChangesPath
1.15 +4 -0 modperl-2.0/src/modules/perl/modperl_perl_includes.h
Index: modperl_perl_includes.h
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_perl_includes.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- modperl_perl_includes.h 31 May 2002 01:06:39 - 1.14
+++ modperl_perl_includes.h 19 Jun 2002 02:02:24 - 1.15
@@ -67,6 +67,10 @@
# define PERL_MAGIC_tied 'P'
#endif
+#ifndef PERL_MAGIC_ext
+# define PERL_MAGIC_ext '~'
+#endif
+
#if defined(__APPLE__) && !defined(PERL_CORE) && !defined(environ)
# include
# define environ (*_NSGetEnviron())
1.45 +2 -2 modperl-2.0/src/modules/perl/modperl_util.c
Index: modperl_util.c
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_util.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- modperl_util.c31 May 2002 01:06:39 - 1.44
+++ modperl_util.c19 Jun 2002 02:02:24 - 1.45
@@ -120,8 +120,8 @@
return r;
}
-if ((mg = SvMAGIC(sv))) {
-return MgTypeExt(mg) ? (request_rec *)mg->mg_ptr : NULL;
+if ((mg = mg_find(sv, PERL_MAGIC_ext))) {
+return (request_rec *)mg->mg_ptr;
}
else {
if (classname && !sv_derived_from(in, classname)) {
cvs commit: modperl-2.0/lib/Apache Build.pm
dougm 2002/06/18 18:32:58
Modified:lib/Apache Build.pm
Log:
only win32 has -DDEBUGGING in both optimize and ccflags
Revision ChangesPath
1.101 +2 -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.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- Build.pm 19 Jun 2002 01:26:28 - 1.100
+++ Build.pm 19 Jun 2002 01:32:58 - 1.101
@@ -252,7 +252,8 @@
$fixup->(\$cflags);
}
-if ($self->{MP_DEBUG}) {
+if (WIN32 and $self->{MP_DEBUG}) {
+#only win32 has -DDEBUGGING in both optimize and ccflags
my $optim = $Config{optimize};
unless ($optim =~ /-DDEBUGGING/) {
cvs commit: modperl-2.0/lib/Apache Build.pm
dougm 2002/06/18 18:26:28
Modified:lib/Apache Build.pm
Log:
need to check ccflags rather than optimize for -DDEBUGGING
Revision ChangesPath
1.100 +1 -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.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- Build.pm 17 Jun 2002 19:42:49 - 1.99
+++ Build.pm 19 Jun 2002 01:26:28 - 1.100
@@ -285,7 +285,7 @@
$val ||= $Config{optimize};
if ($self->{MP_DEBUG}) {
-return ' ' unless $val =~ /-DDEBUGGING/;
+return ' ' unless $Config{ccflags} =~ /-DDEBUGGING/;
}
$val;
