develooper Front page | perl.perl5.porters | Postings from March 2000

[PATCH nvi-1.79 RC2]

From:
Greg Bacon
Date:
March 16, 2000 10:15
Subject:
[PATCH nvi-1.79 RC2]
Message ID:
200003161822.MAA20691@ruby.itsc.uah.edu
nvi-1.79 needed this patch to successfully embed perl-5.6.0-RC2:

diff -ru nvi-1.79.dist/build/Makefile.in nvi-1.79/build/Makefile.in
--- nvi-1.79.dist/build/Makefile.in	Wed Oct 23 08:43:38 1996
+++ nvi-1.79/build/Makefile.in	Thu Mar 16 12:00:04 2000
@@ -140,7 +140,7 @@
 	@echo "Installing Perl scripts: $(datadir)/vi/perl ..."
 	$(mkdir) $(datadir)/vi/perl && $(chmod) $(dmode) $(datadir)/vi/perl
 	[ -f VI.pm ] && $(cp) VI.pm $(datadir)/vi/perl && \
-	    cd $(datadir)/vi/perl && $(chmod) $(fmode) VI.pm)
+	    (cd $(datadir)/vi/perl && $(chmod) $(fmode) VI.pm)
 	(cd $(srcdir)/perl_scripts && $(cp) *.pl $(datadir)/vi/perl && \
 	    cd $(datadir)/vi/perl && $(chmod) $(fmode) *.pl)
 	@echo "Installing Tcl scripts: $(datadir)/vi/tcl ..."
diff -ru nvi-1.79.dist/perl_api/perl.xs nvi-1.79/perl_api/perl.xs
--- nvi-1.79.dist/perl_api/perl.xs	Wed Oct 16 13:16:34 1996
+++ nvi-1.79/perl_api/perl.xs	Thu Mar 16 12:17:04 2000
@@ -33,6 +33,7 @@
 
 #include "../common/common.h"
 
+#define PERL_POLLUTE
 #include <EXTERN.h>
 #include <perl.h>
 #include <XSUB.h>
@@ -94,7 +95,7 @@
 #ifdef HAVE_PERL_5_003_01
 	SV* sv = newSVpv(string, 0);
 
-	perl_eval_sv(sv, G_DISCARD | G_NOARGS);
+	Perl_eval_sv(sv, G_DISCARD | G_NOARGS);
 	SvREFCNT_dec(sv);
 #else
 	char *argv[2];
@@ -142,7 +143,7 @@
         perl_call_argv("VI::bootstrap", G_DISCARD, bootargs);
 	perl_eval("$SIG{__WARN__}='VI::Warn'");
 
-	av_unshift(av = GvAVn(incgv), 1);
+	av_unshift(av = GvAVn(PL_incgv), 1);
 	av_store(av, 0, newSVpv(_PATH_PERLSCRIPTS,
 				sizeof(_PATH_PERLSCRIPTS)-1));
 
@@ -343,7 +344,7 @@
 	sv_setpvn(sv, "sub VI::perldo {", sizeof("sub VI::perldo {")-1); 
 	sv_catpvn(sv, cmdp, length);
 	sv_catpvn(sv, "}", 1);
-	perl_eval_sv(sv, G_DISCARD | G_NOARGS);
+	Perl_eval_sv(sv, G_DISCARD | G_NOARGS);
 	SvREFCNT_dec(sv);
 	str = SvPV(GvSV(errgv),length);
 	if (length)
@@ -420,10 +421,8 @@
 #ifdef HAVE_PERL_5_003_01
 	dXSUB_SYS;
 #endif
-	char *file = __FILE__;
-
-	newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
-	newXS("VI::bootstrap", boot_VI, file);
+	newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, __FILE__);
+	newXS("VI::bootstrap", boot_VI, __FILE__);
 }
 
 typedef SCR *	VI;
End of patch.



nntp.perl.org: Perl Programming lists via nntp and http.
Comments to Ask Bjørn Hansen at ask@perl.org | Group listing | About