From d992b805aee00d5cbe6a516f7c52c3deef767a40 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Wed, 16 Dec 1998 04:00:25 +0000
Subject: [PATCH] Make this work with the perl5 in the source tree - the API
 has "evolved" and some code glitches had to be fixed.

---
 contrib/nvi/perl_api/perl.xs    | 8 +++++---
 contrib/nvi/perl_api/perlsfio.c | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/contrib/nvi/perl_api/perl.xs b/contrib/nvi/perl_api/perl.xs
index 0b48cded5bf..056b2d2cd13 100644
--- a/contrib/nvi/perl_api/perl.xs
+++ b/contrib/nvi/perl_api/perl.xs
@@ -18,6 +18,7 @@ static const char sccsid[] = "@(#)perl.xs	8.27 (Berkeley) 10/16/96";
 #endif /* not lint */
 
 #include <sys/types.h>
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/time.h>
 
@@ -30,6 +31,7 @@ static const char sccsid[] = "@(#)perl.xs	8.27 (Berkeley) 10/16/96";
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include "../common/common.h"
 
@@ -142,7 +144,7 @@ perl_init(scrp)
         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));
 
@@ -417,11 +419,11 @@ extern void boot_VI _((CV* cv));
 static void
 xs_init()
 {
+	char *file = __FILE__;
+
 #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);
 }
diff --git a/contrib/nvi/perl_api/perlsfio.c b/contrib/nvi/perl_api/perlsfio.c
index 20ff4773495..d507585aa48 100644
--- a/contrib/nvi/perl_api/perlsfio.c
+++ b/contrib/nvi/perl_api/perlsfio.c
@@ -14,6 +14,7 @@ static const char sccsid[] = "@(#)perlsfio.c	8.1 (Berkeley) 9/24/96";
 #endif /* not lint */
 
 #include <sys/types.h>
+#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/time.h>
 
@@ -26,6 +27,7 @@ static const char sccsid[] = "@(#)perlsfio.c	8.1 (Berkeley) 9/24/96";
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include "../common/common.h"