--- /usr/sw-src/perl/ext/Wais/Makefile.PL	Fri Oct 20 12:04:39 2000
+++ Makefile.PL	Fri Oct 20 12:23:37 2000
@@ -20,7 +20,7 @@
 use ExtUtils::MakeMaker;
 use Config;
 
-require 5.6.0;
+#require 5.6.0;
 
 
 ## find waisindex and waisserver binaries, wais.h and libwais.a
--- /usr/sw-src/perl/ext/Wais/Wais.xs	Fri Oct 20 12:13:55 2000
+++ Wais.xs	Fri Oct 20 12:25:01 2000
@@ -177,14 +177,14 @@
   if (items == 1) {
     /* NOP */
   } else if (items == 2) {
-    word = (char *) SvPV_nolen(ST(1));
+    word = (char *) SvPV(ST(1), PL_na);
     if (word[strlen(word) - 1] != '*') {
       field = word;
       word = NULL;
     }
   } else if (items == 3) {
-    field = (char *) SvPV_nolen(ST(1));
-    word = (char *) SvPV_nolen(ST(2));
+    field = (char *) SvPV(ST(1), PL_na);
+    word = (char *) SvPV(ST(2), PL_na);
   } else {
     EXTEND(sp, 1);
     PUSHs(&PL_sv_undef);
@@ -218,14 +218,14 @@
   if (items == 1) {
     /* NOP */
   } else if (items == 2) {
-    word = (char *) SvPV_nolen(ST(1));
+    word = (char *) SvPV(ST(1), PL_na);
     if (word[strlen(word) - 1] != '*') {
       field = word;
       word = NULL;
     }
   } else if (items == 3) {
-    field = (char *) SvPV_nolen(ST(1));
-    word = (char *) SvPV_nolen(ST(2));
+    field = (char *) SvPV(ST(1), PL_na);
+    word = (char *) SvPV(ST(2), PL_na);
   } else {
     EXTEND(sp, 1);
     PUSHs(&PL_sv_undef);
@@ -256,10 +256,10 @@
   long            number_of_postings = 0;
 
   if (items == 2) {
-    word = (char *) SvPV_nolen(ST(1));
+    word = (char *) SvPV(ST(1), PL_na);
   } else if (items == 3) {
-    field = (char *) SvPV_nolen(ST(1));
-    word = (char *) SvPV_nolen(ST(2));
+    field = (char *) SvPV(ST(1), PL_na);
+    word = (char *) SvPV(ST(2), PL_na);
   } else {
     EXTEND(sp, 1);
     PUSHs(&PL_sv_undef);
@@ -366,7 +366,7 @@
 	SV            **this = av_fetch(darr, 2 * i, 0);
 	SV            **type = av_fetch(darr, 2 * i + 1, 0);
 
-	itype = SvPV_nolen(*type);
+	itype = SvPV(*type, PL_na);
 	if (sv_isa(*this, "Wais::Docid")) {
 	  docid.bytes = SvPV(SvRV(*this), p_stl);
           docid.size=p_stl;
--- /usr/sw-src/perl/ext/Wais/HTWAIS.c	Tue Jan  4 23:32:43 2000
+++ HTWAIS.c	Fri Oct 20 12:23:55 2000
@@ -26,7 +26,7 @@
 #endif
 #include "HTWAIS.h"
 
-#define str_get(A) SvPV_nolen(A)
+#define str_get(A) SvPV(A, PL_na)
 #define str_ncat sv_catpvn
 
 #define MAX_MESSAGE_LEN 100000
